Fix build in ISO C++11 mode

Change-Id: If1df25e39a00f5141247ed044bda3a14cd16c3bd