[Boost-commit] svn:boost r81596 - in trunk: boost/config libs/config/doc libs/config/test libs/config/test/all tools/inspect

Subject: [Boost-commit] svn:boost r81596 - in trunk: boost/config libs/config/doc libs/config/test libs/config/test/all tools/inspect
From: marshall_at_[hidden]
Date: 2012-11-27 15:51:49

Author: marshall
Date: 2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
New Revision: 81596
URL: http://svn.boost.org/trac/boost/changeset/81596

Log:
removed tests for deprecated macro BOOST_NO_STD_UNORDERED from Boost.Config
Removed:
   trunk/libs/config/test/boost_no_std_unordered.ipp
   trunk/libs/config/test/no_std_unordered_fail.cpp
   trunk/libs/config/test/no_std_unordered_pass.cpp
Text files modified: 
   trunk/boost/config/suffix.hpp                  |    10 +++++-----                              
   trunk/libs/config/doc/macro_reference.qbk      |     4 ++--                                    
   trunk/libs/config/test/all/Jamfile.v2          |     3 ---                                     
   trunk/libs/config/test/boost_has_hash.ipp      |     4 ++--                                    
   trunk/libs/config/test/config_info.cpp         |     1 -                                       
   trunk/libs/config/test/config_test.cpp         |    10 ----------                              
   trunk/tools/inspect/deprecated_macro_check.cpp |     2 +-                                      
   7 files changed, 10 insertions(+), 24 deletions(-)

Modified: trunk/boost/config/suffix.hpp
==============================================================================
--- trunk/boost/config/suffix.hpp	(original)
+++ trunk/boost/config/suffix.hpp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -660,8 +660,8 @@
 //  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 @@
 #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)

Modified: trunk/libs/config/doc/macro_reference.qbk
==============================================================================
--- trunk/libs/config/doc/macro_reference.qbk	(original)
+++ trunk/libs/config/doc/macro_reference.qbk	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -636,7 +636,7 @@
 [[`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
 <unordered_map> and <unordered_set>. 
 ]]                  
 [[`BOOST_NO_CXX11_UNICODE_LITERALS`][The compiler does not support
@@ -1048,7 +1048,7 @@
 [[`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][]]

Modified: trunk/libs/config/test/all/Jamfile.v2
==============================================================================
--- trunk/libs/config/test/all/Jamfile.v2	(original)
+++ trunk/libs/config/test/all/Jamfile.v2	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -55,9 +55,6 @@
 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 ] ;

Modified: trunk/libs/config/test/boost_has_hash.ipp
==============================================================================
--- trunk/libs/config/test/boost_has_hash.ipp	(original)
+++ trunk/libs/config/test/boost_has_hash.ipp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -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 <ext/hash_set>
 #    include <ext/hash_map>
 #  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 <ext/*> 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.

Deleted: trunk/libs/config/test/boost_no_std_unordered.ipp
==============================================================================
--- trunk/libs/config/test/boost_no_std_unordered.ipp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
+++ (empty file)
@@ -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:         <unordered_map> and <unordered_set>
-//  DESCRIPTION:   Check for C++0x unordered container support
-
-#include <unordered_map>
-#include <unordered_set>
-
-namespace boost_no_std_unordered{
-
-int test()
-{
-   std::unordered_map<int, int> im;
-   std::unordered_set<int> is;
-   std::unordered_multimap<int, int> imm;
-   std::unordered_multiset<int> ims;
-   return im.size() + is.size() + imm.size() + ims.size(); // all zero
-}
-
-}
-

Modified: trunk/libs/config/test/config_info.cpp
==============================================================================
--- trunk/libs/config/test/config_info.cpp	(original)
+++ trunk/libs/config/test/config_info.cpp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -1081,7 +1081,6 @@
    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);

Modified: trunk/libs/config/test/config_test.cpp
==============================================================================
--- trunk/libs/config/test/config_test.cpp	(original)
+++ trunk/libs/config/test/config_test.cpp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -42,11 +42,6 @@
 #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 @@
       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;

Deleted: trunk/libs/config/test/no_std_unordered_fail.cpp
==============================================================================
--- trunk/libs/config/test/no_std_unordered_fail.cpp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
+++ (empty file)
@@ -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 <boost/config.hpp>
-#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();
-}
-

Deleted: trunk/libs/config/test/no_std_unordered_pass.cpp
==============================================================================
--- trunk/libs/config/test/no_std_unordered_pass.cpp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
+++ (empty file)
@@ -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 <boost/config.hpp>
-#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();
-}
-

Modified: trunk/tools/inspect/deprecated_macro_check.cpp
==============================================================================
--- trunk/tools/inspect/deprecated_macro_check.cpp	(original)
+++ trunk/tools/inspect/deprecated_macro_check.cpp	2012-11-27 15:51:48 EST (Tue, 27 Nov 2012)
@@ -64,7 +64,7 @@
         "BOOST_NO_RVALUE_REFERENCES",
         "BOOST_NO_SCOPED_ENUMS",
         "BOOST_NO_STATIC_ASSERT",
-	"BOOST_NO_STD_UNORDERD",
+	"BOOST_NO_STD_UNORDERED",
         "BOOST_NO_UNICODE_LITERALS",
         "BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX",
         "BOOST_NO_VARIADIC_TEMPLATES",