c++11ism

Change-Id: I54a32d1e07173e2cd5522e1b2e7ceff3b4f3378c