changes for gcc4.8

Change-Id: Ic8fefa6225e86183fe395cf58f3dd5bf34302889