Fix compilation error for C++11

Change-Id: I640861a0457242863057bd567a89f08a65d6c2c4