changes for gcc4.8

Change-Id: Icf544d8ea9d094191c490c450899422fba6f6dda