Try to fix compilation with pre-C++11 compiler

Change-Id: Ic014db043a08fc2b82c56e6a1f944c9403c441d0