Fix for cross-compiling on OS-X with C++11
Merge pull request #889 from sorlok/osx_c++11

Fix for cross-compiling on OS-X with C++11