C++11 fix

Change-Id: Idd9a0d72c39ade3cf9b36f818cc24cb346853893