diff options
Diffstat (limited to 'boost/parameter/name.hpp')
-rw-r--r-- | boost/parameter/name.hpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/boost/parameter/name.hpp b/boost/parameter/name.hpp index 7352616e7a..f439df416b 100644 --- a/boost/parameter/name.hpp +++ b/boost/parameter/name.hpp @@ -16,7 +16,6 @@ # include <boost/mpl/placeholders.hpp> # if !defined(BOOST_NO_SFINAE) \ - && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592)) # include <boost/utility/enable_if.hpp> @@ -75,19 +74,6 @@ struct lambda< # define BOOST_PARAMETER_IS_BINARY(x) BOOST_PP_IS_BINARY(x) # endif -# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) -# define BOOST_PARAMETER_NAME_OBJECT(tag, name) \ - static ::boost::parameter::keyword<tag> const& name \ - = ::boost::parameter::keyword<tag>::instance; -# else -# define BOOST_PARAMETER_NAME_OBJECT(tag, name) \ - namespace \ - { \ - ::boost::parameter::keyword<tag> const& name \ - = ::boost::parameter::keyword<tag>::instance; \ - } -# endif - # define BOOST_PARAMETER_BASIC_NAME(tag_namespace, tag, name) \ namespace tag_namespace \ { \ @@ -107,7 +93,11 @@ struct lambda< > _1; \ }; \ } \ - BOOST_PARAMETER_NAME_OBJECT(tag_namespace::tag, name) + namespace \ + { \ + ::boost::parameter::keyword<tag_namespace::tag> const& name \ + = ::boost::parameter::keyword<tag_namespace::tag>::instance; \ + } # define BOOST_PARAMETER_COMPLEX_NAME_TUPLE1(tag,namespace) \ (tag, namespace), ~ |