Index: object_pool.hpp =================================================================== --- object_pool.hpp (revision 3391) +++ object_pool.hpp (working copy) @@ -19,6 +19,11 @@ # define BOOST_NO_TEMPLATE_CV_REF_OVERLOADS #endif +#pragma push_macro("malloc") +#pragma push_macro("free") +#undef malloc +#undef free + // The following code might be put into some Boost.Config header in a later revision #ifdef __BORLANDC__ # pragma option push -w-inl @@ -154,4 +159,7 @@ # pragma option pop #endif +#pragma pop_macro("malloc") +#pragma pop_macro("free") + #endif Index: pool.hpp =================================================================== --- pool.hpp (revision 3391) +++ pool.hpp (working copy) @@ -26,6 +26,11 @@ #include +#pragma push_macro("malloc") +#pragma push_macro("free") +#undef malloc +#undef free + // boost::details::pool::ct_lcm #include // boost::details::pool::lcm @@ -581,4 +586,7 @@ } // namespace boost +#pragma pop_macro("malloc") +#pragma pop_macro("free") + #endif Index: singleton_pool.hpp =================================================================== --- singleton_pool.hpp (revision 3391) +++ singleton_pool.hpp (working copy) @@ -18,6 +18,11 @@ // boost::details::pool::guard #include +#pragma push_macro("malloc") +#pragma push_macro("free") +#undef malloc +#undef free + namespace boost { // @@ -116,4 +121,7 @@ } // namespace boost +#pragma pop_macro("malloc") +#pragma pop_macro("free") + #endif