Fix C++11 issues.
C++11:fix compilation errors

Change-Id: Ied9c3613482b815a889ff69739d204871110878e