Fix build errors
Merge pull request #635 from taka-no-me:c++11