Merge pull request #966 from davidcunado-arm/dc/build_with_gcc6.2

Resolve build errors flagged by GCC 6.2