Modified code to compile with Boost_1_54