Fix compilation with GCC 4.7

Change-Id: I834b88fbebe509f73b013f1f5554ceb0c7e45d74