From 85a03d3453a4cde5a4648e0bf08fa543f4f8888a Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 3 Feb 2018 16:18:12 +0000 Subject: [PATCH] Fix integral_constant.hpp for the case where the user has explicitly defined BOOST_MPL_CFG_NO_ADL_BARRIER_NAMESPACE. Fixes: https://svn.boost.org/trac10/ticket/12212 --- include/boost/type_traits/integral_constant.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/boost/type_traits/integral_constant.hpp b/include/boost/type_traits/integral_constant.hpp index ae2448d..164cb11 100644 --- a/include/boost/type_traits/integral_constant.hpp +++ b/include/boost/type_traits/integral_constant.hpp @@ -13,7 +13,8 @@ || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840)) \ || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202)) \ - || BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, BOOST_TESTED_AT(810)) ) + || BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, BOOST_TESTED_AT(810)) )\ + || defined(BOOST_MPL_CFG_NO_ADL_BARRIER_NAMESPACE) namespace boost{