changes for gcc4.8

Change-Id: Iad0b559ae1aa9aa834db75b272de09c8b487b936