fix build with ISO C++ 11 compilers

Change-Id: I11be0f7af68d4eb7e48a66edf539f1cd01b8fb16