Merge pull request #203 from apache/gcc_4_8_5_compat

compatibility with gcc 4.8.5