Added BOOST_NO_STD_UNORDERED config macro.

[SVN r50362]
2025-07-31 04:47:16 +02:00 · 2008-12-22 09:45:31 +00:00
parent d0b83d60af
commit 167b63bd33
22 changed files with 195 additions and 17 deletions
--- a/doc/html/boost_config/acknowledgements.html
+++ b/doc/html/boost_config/acknowledgements.html
@ -3,8 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Acknowledgements</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Boost.Config">
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot_8125">
+<link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="rationale.html" title="Rationale">
 </head>
--- a/doc/html/boost_config/boost_macro_reference.html
+++ b/doc/html/boost_config/boost_macro_reference.html
@ -3,8 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Boost Macro Reference</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Boost.Config">
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot_8125">
+<link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="../index.html" title="Boost.Config">
 <link rel="next" href="guidelines_for_boost_authors.html" title="Guidelines for Boost Authors">
@ -2406,6 +2406,18 @@
              </td>
 </tr>
 <tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">BOOST_NO_STD_UNORDERD</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                The standard library does not support &lt;unordered_map&gt; and &lt;unordered_set&gt;.
+              </p>
+              </td>
+</tr>
+<tr>
 <td>
              <p>
                <code class="computeroutput"><span class="identifier">BOOST_NO_UNICODE_LITERALS</span></code>
--- a/doc/html/boost_config/guidelines_for_boost_authors.html
+++ b/doc/html/boost_config/guidelines_for_boost_authors.html
@ -3,8 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Guidelines for Boost Authors</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Boost.Config">
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot_8125">
+<link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="boost_macro_reference.html" title="Boost Macro Reference">
 <link rel="next" href="rationale.html" title="Rationale">
--- a/doc/html/boost_config/rationale.html
+++ b/doc/html/boost_config/rationale.html
@ -3,8 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Rationale</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Boost.Config">
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot_8125">
+<link rel="home" href="../index.html" title="Boost.Config">
 <link rel="up" href="../index.html" title="Boost.Config">
 <link rel="prev" href="guidelines_for_boost_authors.html" title="Guidelines for Boost Authors">
 <link rel="next" href="acknowledgements.html" title="Acknowledgements">
--- a/doc/html/index.html
+++ b/doc/html/index.html
@ -3,8 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Boost.Config</title>
 <link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="Boost.Config">
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot_8125">
+<link rel="home" href="index.html" title="Boost.Config">
 <link rel="next" href="boost_config/boost_macro_reference.html" title="Boost Macro Reference">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@ -28,7 +28,7 @@
 </h3></div></div></div>
 <div><p class="copyright">Copyright <20> 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock</p></div>
 <div><div class="legalnotice">
-<a name="id2843756"></a><p>
+<a name="id473249"></a><p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
@ -960,7 +960,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: December 04, 2008 at 21:06:12 GMT</small></p></td>
+<td align="left"><p><small>Last revised: December 21, 2008 at 17:07:02 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/doc/macro_reference.qbk
+++ b/doc/macro_reference.qbk
@ -565,6 +565,9 @@ scoped enumerations (`enum class`).
 [[`BOOST_NO_STATIC_ASSERT`][The compiler does not support
 `static_assert`. 
 ]]                  
+[[`BOOST_NO_STD_UNORDERD`][The standard library does not support
+<unordered_map> and <unordered_set>. 
+]]                  
 [[`BOOST_NO_UNICODE_LITERALS`][The compiler does not support
 Unicode (`u8`, `u`, `U`) literals. 
 ]]               
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@ -78,6 +78,11 @@
 #  define BOOST_NO_STD_ITERATOR_TRAITS
 #endif

+//
+// No std::unordered_* containers yet:
+//
+#define BOOST_NO_STD_UNORDERED
+
 #if defined(__ICL) && (__ICL < 800) && defined(_CPPLIB_VER) && (_CPPLIB_VER <= 310)
 // Intel C++ chokes over any non-trivial use of <locale>
 // this may be an overly restrictive define, but regex fails without it:
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@ -32,6 +32,10 @@
 #  define BOOST_HAS_HASH
 #  define BOOST_HAS_SLIST
 #endif
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED

 //
 // Intrinsic type_traits support.
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@ -76,3 +76,8 @@
 #   define BOOST_HASH_MAP_HEADER <backward/hash_map>
 # endif
 #endif
+
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#  define BOOST_NO_STD_UNORDERED
+#endif
+
--- a/include/boost/config/stdlib/modena.hpp
+++ b/include/boost/config/stdlib/modena.hpp
@ -21,6 +21,10 @@
 #ifndef MSIPL_WCHART
 #define BOOST_NO_STD_WSTRING
 #endif
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED

 #define BOOST_STDLIB "Modena C++ standard library"

--- a/include/boost/config/stdlib/msl.hpp
+++ b/include/boost/config/stdlib/msl.hpp
@ -45,6 +45,10 @@
 #  define BOOST_NO_STD_USE_FACET
 #  define BOOST_HAS_TWO_ARG_USE_FACET
 #endif
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED


 #define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__)
--- a/include/boost/config/stdlib/roguewave.hpp
+++ b/include/boost/config/stdlib/roguewave.hpp
@ -151,3 +151,9 @@
 #    define _HP_INSTANTIATE_STD2_VL
 #  endif
 #endif
+
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED
+
--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@ -76,6 +76,7 @@
 //
 #define BOOST_HAS_HASH
 #define BOOST_HAS_SLIST
+#define BOOST_NO_STD_UNORDERED

 //
 // If this is GNU libstdc++2, then no <limits> and no std::wstring:
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@ -61,6 +61,9 @@
 #  endif
 #endif

+#if defined(_STLPORT_VERSION) && (_STLPORT_VERSION < 0x500)
+#  define BOOST_NO_STD_UNORDERED
+#endif
 //
 // Without member template support enabled, their are no template
 // iterate constructors, and no std::allocator:
--- a/include/boost/config/stdlib/vacpp.hpp
+++ b/include/boost/config/stdlib/vacpp.hpp
@ -11,6 +11,7 @@

 #define BOOST_HAS_MACRO_USE_FACET
 #define BOOST_NO_STD_MESSAGES
+#define BOOST_NO_STD_UNORDERED

 #define BOOST_STDLIB "Visual Age default standard library"

--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Wed Sep 24 11:44:22 2008
+# This file was automatically generated on Tue Dec 16 16:41:41 2008
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@ -337,6 +337,9 @@ test-suite "BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN" :
 test-suite "BOOST_NO_STD_TYPEINFO" : 
 [ run ../no_std_typeinfo_pass.cpp ]
 [ compile-fail ../no_std_typeinfo_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_STD_USE_FACET" : 
 [ run ../no_std_use_facet_pass.cpp ]
 [ compile-fail ../no_std_use_facet_fail.cpp ] ;
--- a/test/boost_has_hash.ipp
+++ b/test/boost_has_hash.ipp
@ -11,9 +11,17 @@
 //                 or hash_map classes.

 #if defined(__GLIBCXX__) || (defined(__GLIBCPP__) && __GLIBCPP__>=20020514) // GCC >= 3.1.0
-#  define BOOST_STD_EXTENSION_NAMESPACE __gnu_cxx
-#include <ext/hash_set>
-#include <ext/hash_map>
+#  ifdef BOOST_NO_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 
+     // 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.
+#    define DISABLE_BOOST_HAS_HASH_TEST
+#  endif
 #else
 #include <hash_set>
 #include <hash_map>
@ -25,6 +33,8 @@

 namespace boost_has_hash{

+#ifndef DISABLE_BOOST_HAS_HASH_TEST
+
 template <class Key, class Eq, class Hash, class Alloc>
 void foo(const BOOST_STD_EXTENSION_NAMESPACE::hash_set<Key,Eq,Hash,Alloc>& )
 {
@ -35,12 +45,16 @@ void foo(const BOOST_STD_EXTENSION_NAMESPACE::hash_map<Key,T,Eq,Hash,Alloc>& )
 {
 }

+#endif
+
 int test()
 {
+#ifndef DISABLE_BOOST_HAS_HASH_TEST
   BOOST_STD_EXTENSION_NAMESPACE::hash_set<int> hs;
   foo(hs);
   BOOST_STD_EXTENSION_NAMESPACE::hash_map<int, long> hm;
   foo(hm);
+#endif
   return 0;
 }

--- a/test/boost_no_std_unordered.ipp
+++ b/test/boost_no_std_unordered.ipp
@ -0,0 +1,27 @@
+//  (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
+}
+
+}
+
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@ -1001,6 +1001,7 @@ 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);
@ -1041,6 +1042,7 @@ void print_boost_macros()



+


   // END GENERATED BLOCK
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@ -1,4 +1,4 @@
-//  This file was automatically generated on Wed Sep 24 11:44:22 2008
+//  This file was automatically generated on Tue Dec 16 16:41:41 2008
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@ -292,6 +292,11 @@ namespace boost_no_std_output_iterator_assign = empty_boost;
 #else
 namespace boost_no_std_typeinfo = 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_STD_USE_FACET
 #include "boost_no_std_use_facet.ipp"
 #else
@ -1146,6 +1151,11 @@ int main( int, char *[] )
      std::cerr << "Failed test for BOOST_NO_STD_TYPEINFO 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_std_use_facet::test())
   {
      std::cerr << "Failed test for BOOST_NO_STD_USE_FACET at: " << __FILE__ << ":" << __LINE__ << std::endl;
--- a/test/no_std_unordered_fail.cpp
+++ b/test/no_std_unordered_fail.cpp
@ -0,0 +1,37 @@
+//  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();
+}
+
--- a/test/no_std_unordered_pass.cpp
+++ b/test/no_std_unordered_pass.cpp
@ -0,0 +1,37 @@
+//  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();
+}
+