From dc8ffe92b861d4de84788a9f914f5f2bea99eb40 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sat, 8 Dec 2012 18:37:29 +0000 Subject: [PATCH] Removed use of deprecated macros [SVN r81801] --- include/boost/utility/base_from_member.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/utility/base_from_member.hpp b/include/boost/utility/base_from_member.hpp index 67faa3b..e32ecb8 100644 --- a/include/boost/utility/base_from_member.hpp +++ b/include/boost/utility/base_from_member.hpp @@ -96,7 +96,7 @@ struct is_related // Contributed by Daryle Walker, based on a work-around by Luc Danton -#ifndef BOOST_NO_VARIADIC_TEMPLATES +#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES template struct enable_if_unrelated : public ::boost::enable_if_c @@ -126,9 +126,9 @@ class base_from_member protected: MemberType member; -#if !defined(BOOST_NO_RVALUE_REFERENCES) && \ - !defined(BOOST_NO_VARIADIC_TEMPLATES) && \ - !defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS) && \ +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \ + !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \ + !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) && \ !(defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 4)) template ::type>