added guards to avoid macro definition when used with boost_config.hpp
Merge pull request #261 from breyed/master

added guards to avoid macro definition when used with boost_config.hpp