From 513a54edea536076dc32f2f6c4ab7866f5f7422e Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 27 Nov 2012 20:51:48 +0000 Subject: [PATCH] removed tests for deprecated macro BOOST_NO_STD_UNORDERED from Boost.Config [SVN r81596] --- doc/macro_reference.qbk | 4 ++-- include/boost/config/suffix.hpp | 10 ++++----- test/all/Jamfile.v2 | 3 --- test/boost_has_hash.ipp | 4 ++-- test/boost_no_std_unordered.ipp | 27 ------------------------ test/config_info.cpp | 1 - test/config_test.cpp | 10 --------- test/no_std_unordered_fail.cpp | 37 --------------------------------- test/no_std_unordered_pass.cpp | 37 --------------------------------- 9 files changed, 9 insertions(+), 124 deletions(-) delete mode 100644 test/boost_no_std_unordered.ipp delete mode 100644 test/no_std_unordered_fail.cpp delete mode 100644 test/no_std_unordered_pass.cpp diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk index 90aa9344..9e9a68f5 100644 --- a/doc/macro_reference.qbk +++ b/doc/macro_reference.qbk @@ -636,7 +636,7 @@ scoped enumerations (`enum class`). [[`BOOST_NO_CXX11_STATIC_ASSERT`][The compiler does not support `static_assert`. ]] -[[`BOOST_NO_CXX11_STD_UNORDERD`][The standard library does not support +[[`BOOST_NO_CXX11_STD_UNORDERED`][The standard library does not support and . ]] [[`BOOST_NO_CXX11_UNICODE_LITERALS`][The compiler does not support @@ -1048,7 +1048,7 @@ They will be removed in a future version of boost. [[`BOOST_NO_RVALUE_REFERENCES`][`BOOST_NO_CXX11_RVALUE_REFERENCES`][Boost 1.51][]] [[`BOOST_NO_SCOPED_ENUMS`][`BOOST_NO_CXX11_SCOPED_ENUMS`][Boost 1.51][]] [[`BOOST_NO_STATIC_ASSERT`][`BOOST_NO_CXX11_STATIC_ASSERT`][Boost 1.51][]] -[[`BOOST_NO_STD_UNORDERD`][`BOOST_NO_CXX11_STD_UNORDERD`][Boost 1.51][]] +[[`BOOST_NO_STD_UNORDERED`][`BOOST_NO_CXX11_STD_UNORDERED`][Boost 1.51][]] [[`BOOST_NO_UNICODE_LITERALS`][`BOOST_NO_CXX11_UNICODE_LITERALS`][Boost 1.51][]] [[`BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX`][`BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX`][Boost 1.51][]] [[`BOOST_NO_VARIADIC_TEMPLATES`][`BOOST_NO_CXX11_VARIADIC_TEMPLATES`][Boost 1.51][]] diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp index 46e1154d..6be7a99e 100644 --- a/include/boost/config/suffix.hpp +++ b/include/boost/config/suffix.hpp @@ -660,8 +660,8 @@ namespace std{ using ::type_info; } // Use BOOST_NO_CXX11_HDR_UNORDERED_SET or BOOST_NO_CXX11_HDR_UNORDERED_MAP // instead of BOOST_NO_STD_UNORDERED #if defined(BOOST_NO_CXX11_HDR_UNORDERED_MAP) || defined (BOOST_NO_CXX11_HDR_UNORDERED_SET) -# ifndef BOOST_NO_STD_UNORDERED -# define BOOST_NO_STD_UNORDERED +# ifndef BOOST_NO_CXX11_STD_UNORDERED +# define BOOST_NO_CXX11_STD_UNORDERED # endif #endif @@ -840,9 +840,9 @@ namespace std{ using ::type_info; } #if defined(BOOST_NO_CXX11_STATIC_ASSERT) && !defined(BOOST_NO_STATIC_ASSERT) # define BOOST_NO_STATIC_ASSERT #endif -// Use BOOST_NO_CXX11_STD_UNORDERD instead of BOOST_NO_STD_UNORDERD -#if defined(BOOST_NO_CXX11_STD_UNORDERD) && !defined(BOOST_NO_STD_UNORDERD) -# define BOOST_NO_STD_UNORDERD +// Use BOOST_NO_CXX11_STD_UNORDERED instead of BOOST_NO_STD_UNORDERED +#if defined(BOOST_NO_CXX11_STD_UNORDERED) && !defined(BOOST_NO_STD_UNORDERED) +# define BOOST_NO_STD_UNORDERED #endif // Use BOOST_NO_CXX11_UNICODE_LITERALS instead of BOOST_NO_UNICODE_LITERALS #if defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(BOOST_NO_UNICODE_LITERALS) diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2 index 8d939ea3..a09b6b2e 100644 --- a/test/all/Jamfile.v2 +++ b/test/all/Jamfile.v2 @@ -55,9 +55,6 @@ test-suite "BOOST_HAS_TR1_REGEX" : test-suite "BOOST_HAS_TR1_FUNCTION" : [ run ../has_tr1_function_pass.cpp ] [ compile-fail ../has_tr1_function_fail.cpp ] ; -test-suite "BOOST_NO_STD_UNORDERED" : -[ run ../no_std_unordered_pass.cpp ] -[ compile-fail ../no_std_unordered_fail.cpp ] ; test-suite "BOOST_NO_CTYPE_FUNCTIONS" : [ run ../no_ctype_functions_pass.cpp ] [ compile-fail ../no_ctype_functions_fail.cpp ] ; diff --git a/test/boost_has_hash.ipp b/test/boost_has_hash.ipp index fb89764d..a3afbb2c 100644 --- a/test/boost_has_hash.ipp +++ b/test/boost_has_hash.ipp @@ -11,12 +11,12 @@ // or hash_map classes. #if defined(__GLIBCXX__) || (defined(__GLIBCPP__) && __GLIBCPP__>=20020514) // GCC >= 3.1.0 -# ifdef BOOST_NO_STD_UNORDERED +# ifdef BOOST_NO_CXX11_STD_UNORDERED # define BOOST_STD_EXTENSION_NAMESPACE __gnu_cxx # include # include # else - // If we have BOOST_NO_STD_UNORDERED *not* defined, then we must + // If we have BOOST_NO_CXX11_STD_UNORDERED *not* defined, then we must // not include the headers as they clash with the C++0x // headers. ie in any given translation unit we can include one // or the other, but not both. diff --git a/test/boost_no_std_unordered.ipp b/test/boost_no_std_unordered.ipp deleted file mode 100644 index c7ad0869..00000000 --- a/test/boost_no_std_unordered.ipp +++ /dev/null @@ -1,27 +0,0 @@ -// (C) Copyright John Maddock and Dave Abrahams 2002. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/config for most recent version. - -// MACRO: BOOST_NO_STD_UNORDERED -// TITLE: and -// DESCRIPTION: Check for C++0x unordered container support - -#include -#include - -namespace boost_no_std_unordered{ - -int test() -{ - std::unordered_map im; - std::unordered_set is; - std::unordered_multimap imm; - std::unordered_multiset ims; - return im.size() + is.size() + imm.size() + ims.size(); // all zero -} - -} - diff --git a/test/config_info.cpp b/test/config_info.cpp index adee14bd..5300578e 100644 --- a/test/config_info.cpp +++ b/test/config_info.cpp @@ -1081,7 +1081,6 @@ void print_boost_macros() PRINT_MACRO(BOOST_NO_STD_MIN_MAX); PRINT_MACRO(BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN); PRINT_MACRO(BOOST_NO_STD_TYPEINFO); - PRINT_MACRO(BOOST_NO_STD_UNORDERED); PRINT_MACRO(BOOST_NO_STD_USE_FACET); PRINT_MACRO(BOOST_NO_STD_WSTREAMBUF); PRINT_MACRO(BOOST_NO_STD_WSTRING); diff --git a/test/config_test.cpp b/test/config_test.cpp index 13b416a5..c7bc7dcb 100644 --- a/test/config_test.cpp +++ b/test/config_test.cpp @@ -42,11 +42,6 @@ namespace boost_no_cxx11_hdr_chrono = empty_boost; #else namespace boost_no_cxx11_hdr_functional = empty_boost; #endif -#ifndef BOOST_NO_STD_UNORDERED -#include "boost_no_std_unordered.ipp" -#else -namespace boost_no_std_unordered = empty_boost; -#endif #ifndef BOOST_NO_CTYPE_FUNCTIONS #include "boost_no_ctype_functions.ipp" #else @@ -946,11 +941,6 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_HAS_TR1_FUNCTION at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_std_unordered::test()) - { - std::cerr << "Failed test for BOOST_NO_STD_UNORDERED at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_ctype_functions::test()) { std::cerr << "Failed test for BOOST_NO_CTYPE_FUNCTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl; diff --git a/test/no_std_unordered_fail.cpp b/test/no_std_unordered_fail.cpp deleted file mode 100644 index afc31bea..00000000 --- a/test/no_std_unordered_fail.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// This file was automatically generated on Tue Dec 16 16:41:40 2008 -// by libs/config/tools/generate.cpp -// Copyright John Maddock 2002-4. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/config for the most recent version.// -// Revision $Id: generate.cpp 49281 2008-10-11 15:40:44Z johnmaddock $ -// - - -// Test file for macro BOOST_NO_STD_UNORDERED -// This file should not compile, if it does then -// BOOST_NO_STD_UNORDERED should not be defined. -// See file boost_no_std_unordered.ipp for details - -// Must not have BOOST_ASSERT_CONFIG set; it defeats -// the objective of this file: -#ifdef BOOST_ASSERT_CONFIG -# undef BOOST_ASSERT_CONFIG -#endif - -#include -#include "test.hpp" - -#ifdef BOOST_NO_STD_UNORDERED -#include "boost_no_std_unordered.ipp" -#else -#error "this file should not compile" -#endif - -int main( int, char *[] ) -{ - return boost_no_std_unordered::test(); -} - diff --git a/test/no_std_unordered_pass.cpp b/test/no_std_unordered_pass.cpp deleted file mode 100644 index 5ef2bf02..00000000 --- a/test/no_std_unordered_pass.cpp +++ /dev/null @@ -1,37 +0,0 @@ -// This file was automatically generated on Tue Dec 16 16:41:40 2008 -// by libs/config/tools/generate.cpp -// Copyright John Maddock 2002-4. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/config for the most recent version.// -// Revision $Id: generate.cpp 49281 2008-10-11 15:40:44Z johnmaddock $ -// - - -// Test file for macro BOOST_NO_STD_UNORDERED -// This file should compile, if it does not then -// BOOST_NO_STD_UNORDERED should be defined. -// See file boost_no_std_unordered.ipp for details - -// Must not have BOOST_ASSERT_CONFIG set; it defeats -// the objective of this file: -#ifdef BOOST_ASSERT_CONFIG -# undef BOOST_ASSERT_CONFIG -#endif - -#include -#include "test.hpp" - -#ifndef BOOST_NO_STD_UNORDERED -#include "boost_no_std_unordered.ipp" -#else -namespace boost_no_std_unordered = empty_boost; -#endif - -int main( int, char *[] ) -{ - return boost_no_std_unordered::test(); -} -