c++11ism

Change-Id: I0838eafa47aaed222aca30d234300f2c05697175