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