From 3179474c0ee8d12a79e223659d8ea76c42ed5899 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 2 Feb 2002 12:16:57 +0000 Subject: [PATCH] Placeholders are now static only on MSVC. [SVN r12630] --- include/boost/bind/placeholders.hpp | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/include/boost/bind/placeholders.hpp b/include/boost/bind/placeholders.hpp index e8c9694..c902e0c 100644 --- a/include/boost/bind/placeholders.hpp +++ b/include/boost/bind/placeholders.hpp @@ -19,20 +19,31 @@ // #include +#include + +// With MSVC precompiled headers, unnamed namespaces are not unique + +#ifdef BOOST_MSVC +# define BOOST_BIND_STATIC static +#else +# define BOOST_BIND_STATIC +#endif namespace { -boost::arg<1> _1; -boost::arg<2> _2; -boost::arg<3> _3; -boost::arg<4> _4; -boost::arg<5> _5; -boost::arg<6> _6; -boost::arg<7> _7; -boost::arg<8> _8; -boost::arg<9> _9; +BOOST_BIND_STATIC boost::arg<1> _1; +BOOST_BIND_STATIC boost::arg<2> _2; +BOOST_BIND_STATIC boost::arg<3> _3; +BOOST_BIND_STATIC boost::arg<4> _4; +BOOST_BIND_STATIC boost::arg<5> _5; +BOOST_BIND_STATIC boost::arg<6> _6; +BOOST_BIND_STATIC boost::arg<7> _7; +BOOST_BIND_STATIC boost::arg<8> _8; +BOOST_BIND_STATIC boost::arg<9> _9; } // unnamed namespace +#undef BOOST_BIND_STATIC + #endif // #ifndef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED