changes for gcc4.8

Change-Id: I3fd3c8d7caad72d4546528f212f071aea035f1b6