Revert "Revert "Revert "fix compile with gcc4.7"""

This reverts commit 52f3e160a3b5bcd89c109539aa548943724988d9.