Changed some macros to BOOST_ versions