|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r50531 - in branches/release: boost/config boost/config/compiler boost/config/platform boost/config/stdlib libs/config libs/config/doc libs/config/doc/html libs/config/doc/html/boost_config libs/config/test libs/config/test/all
From: john_at_[hidden]
Date: 2009-01-10 06:18:44
Author: johnmaddock
Date: 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
New Revision: 50531
URL: http://svn.boost.org/trac/boost/changeset/50531
Log:
Merge changes from Trunk.
Added:
branches/release/libs/config/module.cmake
- copied unchanged from r50530, /trunk/libs/config/module.cmake
branches/release/libs/config/test/boost_no_std_unordered.ipp
- copied unchanged from r50530, /trunk/libs/config/test/boost_no_std_unordered.ipp
branches/release/libs/config/test/no_std_unordered_fail.cpp
- copied unchanged from r50530, /trunk/libs/config/test/no_std_unordered_fail.cpp
branches/release/libs/config/test/no_std_unordered_pass.cpp
- copied unchanged from r50530, /trunk/libs/config/test/no_std_unordered_pass.cpp
Text files modified:
branches/release/boost/config/auto_link.hpp | 7 ++++
branches/release/boost/config/compiler/codegear.hpp | 1
branches/release/boost/config/compiler/visualc.hpp | 11 +++++++-
branches/release/boost/config/platform/bsd.hpp | 7 +++--
branches/release/boost/config/stdlib/dinkumware.hpp | 5 ++++
branches/release/boost/config/stdlib/libcomo.hpp | 4 +++
branches/release/boost/config/stdlib/libstdcpp3.hpp | 5 ++++
branches/release/boost/config/stdlib/modena.hpp | 4 +++
branches/release/boost/config/stdlib/msl.hpp | 4 +++
branches/release/boost/config/stdlib/roguewave.hpp | 6 ++++
branches/release/boost/config/stdlib/sgi.hpp | 1
branches/release/boost/config/stdlib/stlport.hpp | 3 ++
branches/release/boost/config/stdlib/vacpp.hpp | 1
branches/release/boost/config/suffix.hpp | 3 +
branches/release/libs/config/doc/html/boost_config/acknowledgements.html | 4 +-
branches/release/libs/config/doc/html/boost_config/boost_macro_reference.html | 49 ++++++++++++++++++++++++---------------
branches/release/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html | 4 +-
branches/release/libs/config/doc/html/boost_config/rationale.html | 4 +-
branches/release/libs/config/doc/html/index.html | 8 +++---
branches/release/libs/config/doc/macro_reference.qbk | 8 ++++-
branches/release/libs/config/test/all/Jamfile.v2 | 5 +++
branches/release/libs/config/test/boost_has_hash.ipp | 20 +++++++++++++--
branches/release/libs/config/test/config_info.cpp | 2 +
branches/release/libs/config/test/config_test.cpp | 12 ++++++++
24 files changed, 135 insertions(+), 43 deletions(-)
Modified: branches/release/boost/config/auto_link.hpp
==============================================================================
--- branches/release/boost/config/auto_link.hpp (original)
+++ branches/release/boost/config/auto_link.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -135,11 +135,16 @@
// vc80:
# define BOOST_LIB_TOOLSET "vc80"
-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1500)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
// vc90:
# define BOOST_LIB_TOOLSET "vc90"
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
+
+ // vc10:
+# define BOOST_LIB_TOOLSET "vc100"
+
#elif defined(__BORLANDC__)
// CBuilder 6:
Modified: branches/release/boost/config/compiler/codegear.hpp
==============================================================================
--- branches/release/boost/config/compiler/codegear.hpp (original)
+++ branches/release/boost/config/compiler/codegear.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -79,6 +79,7 @@
# define BOOST_HAS_MACRO_USE_FACET
+# define BOOST_NO_INITIALIZER_LISTS
// On non-Win32 platforms let the platform config figure this out:
# ifdef _WIN32
Modified: branches/release/boost/config/compiler/visualc.hpp
==============================================================================
--- branches/release/boost/config/compiler/visualc.hpp (original)
+++ branches/release/boost/config/compiler/visualc.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -22,6 +22,11 @@
# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
# define BOOST_NO_VOID_RETURNS
# define BOOST_NO_EXCEPTION_STD_NAMESPACE
+
+# if BOOST_MSVC == 1202
+# define BOOST_NO_STD_TYPEINFO
+# endif
+
// disable min/max macro defines on vc6:
//
#endif
@@ -79,7 +84,7 @@
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#endif
-#if _MSC_VER <= 1500 // 1500 == VC++ 9.0
+#if _MSC_VER <= 1600 // 1600 == VC++ 10.0
# define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#endif
@@ -179,6 +184,8 @@
# define BOOST_COMPILER_VERSION 8.0
# elif _MSC_VER == 1500
# define BOOST_COMPILER_VERSION 9.0
+# elif _MSC_VER == 1600
+# define BOOST_COMPILER_VERSION 10.0
# else
# define BOOST_COMPILER_VERSION _MSC_VER
# endif
@@ -194,7 +201,7 @@
#endif
//
// last known and checked version is 1500 (VC9):
-#if (_MSC_VER > 1500)
+#if (_MSC_VER > 1600)
# if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results"
# else
Modified: branches/release/boost/config/platform/bsd.hpp
==============================================================================
--- branches/release/boost/config/platform/bsd.hpp (original)
+++ branches/release/boost/config/platform/bsd.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -36,7 +36,8 @@
// FreeBSD 3.x has pthreads support, but defines _POSIX_THREADS in <pthread.h>
// and not in <unistd.h>
//
-#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3)) || defined(__OpenBSD__)
+#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3))\
+ || defined(__OpenBSD__) || defined(__DragonFly__)
# define BOOST_HAS_PTHREADS
#endif
@@ -55,13 +56,13 @@
#endif
#if !((defined(__FreeBSD__) && (__FreeBSD__ >= 5)) \
- || (__NetBSD_GCC__ >= 2095003))
+ || (__NetBSD_GCC__ >= 2095003) || defined(__DragonFly__))
# define BOOST_NO_CWCHAR
#endif
//
// The BSD <ctype.h> has macros only, no functions:
//
-#if !defined(__OpenBSD__)
+#if !defined(__OpenBSD__) || defined(__DragonFly__)
# define BOOST_NO_CTYPE_FUNCTIONS
#endif
Modified: branches/release/boost/config/stdlib/dinkumware.hpp
==============================================================================
--- branches/release/boost/config/stdlib/dinkumware.hpp (original)
+++ branches/release/boost/config/stdlib/dinkumware.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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:
Modified: branches/release/boost/config/stdlib/libcomo.hpp
==============================================================================
--- branches/release/boost/config/stdlib/libcomo.hpp (original)
+++ branches/release/boost/config/stdlib/libcomo.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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.
Modified: branches/release/boost/config/stdlib/libstdcpp3.hpp
==============================================================================
--- branches/release/boost/config/stdlib/libstdcpp3.hpp (original)
+++ branches/release/boost/config/stdlib/libstdcpp3.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -76,3 +76,8 @@
# define BOOST_HASH_MAP_HEADER <backward/hash_map>
# endif
#endif
+
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+# define BOOST_NO_STD_UNORDERED
+#endif
+
Modified: branches/release/boost/config/stdlib/modena.hpp
==============================================================================
--- branches/release/boost/config/stdlib/modena.hpp (original)
+++ branches/release/boost/config/stdlib/modena.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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"
Modified: branches/release/boost/config/stdlib/msl.hpp
==============================================================================
--- branches/release/boost/config/stdlib/msl.hpp (original)
+++ branches/release/boost/config/stdlib/msl.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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__)
Modified: branches/release/boost/config/stdlib/roguewave.hpp
==============================================================================
--- branches/release/boost/config/stdlib/roguewave.hpp (original)
+++ branches/release/boost/config/stdlib/roguewave.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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
+
Modified: branches/release/boost/config/stdlib/sgi.hpp
==============================================================================
--- branches/release/boost/config/stdlib/sgi.hpp (original)
+++ branches/release/boost/config/stdlib/sgi.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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:
Modified: branches/release/boost/config/stdlib/stlport.hpp
==============================================================================
--- branches/release/boost/config/stdlib/stlport.hpp (original)
+++ branches/release/boost/config/stdlib/stlport.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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:
Modified: branches/release/boost/config/stdlib/vacpp.hpp
==============================================================================
--- branches/release/boost/config/stdlib/vacpp.hpp (original)
+++ branches/release/boost/config/stdlib/vacpp.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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"
Modified: branches/release/boost/config/suffix.hpp
==============================================================================
--- branches/release/boost/config/suffix.hpp (original)
+++ branches/release/boost/config/suffix.hpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -223,7 +223,8 @@
// from here then add to the appropriate compiler section):
//
#if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \
- || defined(_PTHREADS)) && !defined(BOOST_HAS_THREADS)
+ || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__)) \
+ && !defined(BOOST_HAS_THREADS)
# define BOOST_HAS_THREADS
#endif
Modified: branches/release/libs/config/doc/html/boost_config/acknowledgements.html
==============================================================================
--- branches/release/libs/config/doc/html/boost_config/acknowledgements.html (original)
+++ branches/release/libs/config/doc/html/boost_config/acknowledgements.html 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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>
Modified: branches/release/libs/config/doc/html/boost_config/boost_macro_reference.html
==============================================================================
--- branches/release/libs/config/doc/html/boost_config/boost_macro_reference.html (original)
+++ branches/release/libs/config/doc/html/boost_config/boost_macro_reference.html 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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">
@@ -2218,7 +2218,6 @@
<colgroup>
<col>
<col>
-<col>
</colgroup>
<thead><tr>
<th>
@@ -2231,7 +2230,6 @@
Description
</p>
</th>
-<td class="auto-generated"> </td>
</tr></thead>
<tbody>
<tr>
@@ -2245,7 +2243,6 @@
The compiler does not support type <code class="computeroutput"><span class="identifier">char16_t</span></code>.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2258,7 +2255,6 @@
The compiler does not support type <code class="computeroutput"><span class="identifier">char32_t</span></code>.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2271,7 +2267,6 @@
The compiler does not support <code class="computeroutput"><span class="identifier">constexpr</span></code>.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2284,7 +2279,6 @@
The compiler does not support <code class="computeroutput"><span class="identifier">decltype</span></code>.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2295,7 +2289,14 @@
<td>
<p>
The compiler does not support defaulted (<code class="computeroutput"><span class="special">=</span>
- <span class="keyword">default</span></code>) functions. [[<code class="computeroutput"><span class="identifier">BOOST_NO_DELETED_FUNCTIONS</span></code>
+ <span class="keyword">default</span></code>) functions.
+ </p>
+ </td>
+</tr>
+<tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">BOOST_NO_DELETED_FUNCTIONS</span></code>
</p>
</td>
<td>
@@ -2317,7 +2318,6 @@
<span class="identifier">T</span><span class="special">()</span></code>).
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2331,7 +2331,6 @@
for templates (<code class="computeroutput"><span class="keyword">explicit</span> <span class="keyword">template</span></code>).
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2344,7 +2343,6 @@
The C++ compiler does not support C++0x initializer lists.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2358,7 +2356,6 @@
<span class="keyword">long</span></code>.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2371,7 +2368,6 @@
The compiler does not support raw string literals.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2384,7 +2380,6 @@
The compiler does not support r-value references.
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2397,7 +2392,6 @@
The compiler does not support scoped enumerations (<code class="computeroutput"><span class="keyword">enum</span> <span class="keyword">class</span></code>).
</p>
</td>
-<td class="auto-generated"> </td>
</tr>
<tr>
<td>
@@ -2410,7 +2404,18 @@
The compiler does not support <code class="computeroutput"><span class="identifier">static_assert</span></code>.
</p>
</td>
-<td class="auto-generated"> </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 <unordered_map> and <unordered_set>.
+ </p>
+ </td>
</tr>
<tr>
<td>
@@ -2421,8 +2426,14 @@
<td>
<p>
The compiler does not support Unicode (<code class="computeroutput"><span class="identifier">u8</span></code>,
- <code class="computeroutput"><span class="identifier">u</span></code>, <code class="computeroutput"><span class="identifier">U</span>#<span class="special">)</span> <span class="identifier">literals</span><span class="special">.</span>
- <span class="special">]]</span> <span class="special">[[</span></code>BOOST_NO_VARIADIC_TEMPLATES`
+ <code class="computeroutput"><span class="identifier">u</span></code>, <code class="computeroutput"><span class="identifier">U</span></code>) literals.
+ </p>
+ </td>
+</tr>
+<tr>
+<td>
+ <p>
+ <code class="computeroutput"><span class="identifier">BOOST_NO_VARIADIC_TEMPLATES</span></code>
</p>
</td>
<td>
Modified: branches/release/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html
==============================================================================
--- branches/release/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html (original)
+++ branches/release/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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">
Modified: branches/release/libs/config/doc/html/boost_config/rationale.html
==============================================================================
--- branches/release/libs/config/doc/html/boost_config/rationale.html (original)
+++ branches/release/libs/config/doc/html/boost_config/rationale.html 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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">
Modified: branches/release/libs/config/doc/html/index.html
==============================================================================
--- branches/release/libs/config/doc/html/index.html (original)
+++ branches/release/libs/config/doc/html/index.html 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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 © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock</p></div>
<div><div class="legalnotice">
-<a name="id2998570"></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 http://www.boost.org/LICENSE_1_0.txt)
</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: January 03, 2009 at 22:54:59 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>
Modified: branches/release/libs/config/doc/macro_reference.qbk
==============================================================================
--- branches/release/libs/config/doc/macro_reference.qbk (original)
+++ branches/release/libs/config/doc/macro_reference.qbk 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -537,7 +537,8 @@
`decltype`.
]]
[[`BOOST_NO_DEFAULTED_FUNCTIONS`][The compiler does not support
-defaulted (`= default`) functions.
+defaulted (`= default`) functions.
+]]
[[`BOOST_NO_DELETED_FUNCTIONS`][The compiler does not support
deleted (`= delete`) functions.
]]
@@ -564,8 +565,11 @@
[[`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.
+Unicode (`u8`, `u`, `U`) literals.
]]
[[`BOOST_NO_VARIADIC_TEMPLATES`][The compiler does not support
variadic templates.
Modified: branches/release/libs/config/test/all/Jamfile.v2
==============================================================================
--- branches/release/libs/config/test/all/Jamfile.v2 (original)
+++ branches/release/libs/config/test/all/Jamfile.v2 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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_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 ] ;
Modified: branches/release/libs/config/test/boost_has_hash.ipp
==============================================================================
--- branches/release/libs/config/test/boost_has_hash.ipp (original)
+++ branches/release/libs/config/test/boost_has_hash.ipp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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 @@
{
}
+#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;
}
Modified: branches/release/libs/config/test/config_info.cpp
==============================================================================
--- branches/release/libs/config/test/config_info.cpp (original)
+++ branches/release/libs/config/test/config_info.cpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -1001,6 +1001,7 @@
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);
@@ -1043,6 +1044,7 @@
+
// END GENERATED BLOCK
PRINT_MACRO(BOOST_INTEL);
Modified: branches/release/libs/config/test/config_test.cpp
==============================================================================
--- branches/release/libs/config/test/config_test.cpp (original)
+++ branches/release/libs/config/test/config_test.cpp 2009-01-10 06:18:42 EST (Sat, 10 Jan 2009)
@@ -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 @@
#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 @@
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;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk