From 62b1bb07d26e6fa4e3bf512280726bcd638b00eb Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Fri, 13 Dec 2013 13:47:50 +0000 Subject: [PATCH] Apply patch from https://svn.boost.org/trac/boost/ticket/9410 --- include/boost/config/compiler/visualc.hpp | 2 +- test/no_decltype_n3276_fail.cpp | 2 +- test/no_decltype_n3276_pass.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 9249e8a6..fb30fc12 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -165,13 +165,13 @@ # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES # define BOOST_NO_CXX11_VARIADIC_TEMPLATES # define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +# define BOOST_NO_CXX11_DECLTYPE_N3276 #endif // C++11 features not supported by any versions #define BOOST_NO_CXX11_CHAR16_T #define BOOST_NO_CXX11_CHAR32_T #define BOOST_NO_CXX11_CONSTEXPR -#define BOOST_NO_CXX11_DECLTYPE_N3276 #define BOOST_NO_CXX11_NOEXCEPT #define BOOST_NO_CXX11_UNICODE_LITERALS #define BOOST_NO_SFINAE_EXPR diff --git a/test/no_decltype_n3276_fail.cpp b/test/no_decltype_n3276_fail.cpp index 35a6d123..1e86fb6f 100644 --- a/test/no_decltype_n3276_fail.cpp +++ b/test/no_decltype_n3276_fail.cpp @@ -32,6 +32,6 @@ int main( int, char *[] ) { - return boost_no_decltype_n3276::test(); + return boost_no_cxx11_decltype_n3276::test(); } diff --git a/test/no_decltype_n3276_pass.cpp b/test/no_decltype_n3276_pass.cpp index b1b8c0a6..0eb3a21f 100644 --- a/test/no_decltype_n3276_pass.cpp +++ b/test/no_decltype_n3276_pass.cpp @@ -27,11 +27,11 @@ #ifndef BOOST_NO_CXX11_DECLTYPE_N3276 #include "boost_no_decltype_n3276.ipp" #else -namespace boost_no_decltype_n3276 = empty_boost; +namespace boost_no_cxx11_decltype_n3276 = empty_boost; #endif int main( int, char *[] ) { - return boost_no_decltype_n3276::test(); + return boost_no_cxx11_decltype_n3276::test(); }