|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73482 - in branches/release: boost/detail libs/detail libs/detail/test libs/detail/test/container_fwd status
From: dnljms_at_[hidden]
Date: 2011-08-01 19:12:20
Author: danieljames
Date: 2011-08-01 19:12:19 EDT (Mon, 01 Aug 2011)
New Revision: 73482
URL: http://svn.boost.org/trac/boost/changeset/73482
Log:
Detail: Merge new version of container_fwd.
And a couple of old failure markups that I hadn't merged yet.
Added:
branches/release/libs/detail/test/container_fwd/
- copied from r73206, /trunk/libs/detail/test/container_fwd/
branches/release/libs/detail/test/container_fwd/Jamfile
- copied unchanged from r73206, /trunk/libs/detail/test/container_fwd/Jamfile
branches/release/libs/detail/test/container_fwd/container_fwd_test.cpp
- copied unchanged from r73206, /trunk/libs/detail/test/container_fwd/container_fwd_test.cpp
branches/release/libs/detail/test/container_fwd/container_no_fwd_test.cpp
- copied unchanged from r73206, /trunk/libs/detail/test/container_fwd/container_no_fwd_test.cpp
branches/release/libs/detail/test/container_fwd/correctly_disable_fail.cpp
- copied unchanged from r73206, /trunk/libs/detail/test/container_fwd/correctly_disable_fail.cpp
Removed:
branches/release/libs/detail/test/container_fwd_test.cpp
branches/release/libs/detail/test/container_no_fwd_test.cpp
Properties modified:
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/interlocked.hpp (props changed)
branches/release/libs/detail/ (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/status/expected_results.xml (props changed)
branches/release/status/explicit-failures-markup.xml (contents, props changed)
branches/release/status/explicit-failures.xsd (props changed)
Text files modified:
branches/release/boost/detail/container_fwd.hpp | 88 ++++++++++++++++++++++++++++-----------
branches/release/libs/detail/test/Jamfile | 2
branches/release/status/explicit-failures-markup.xml | 61 +++++++++++++++++++++++----
3 files changed, 116 insertions(+), 35 deletions(-)
Modified: branches/release/boost/detail/container_fwd.hpp
==============================================================================
--- branches/release/boost/detail/container_fwd.hpp (original)
+++ branches/release/boost/detail/container_fwd.hpp 2011-08-01 19:12:19 EDT (Mon, 01 Aug 2011)
@@ -1,25 +1,75 @@
-// Copyright 2005-2008 Daniel James.
+// Copyright 2005-2011 Daniel James.
// 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)
+// Note: if you change this include guard, you also need to change
+// container_fwd_compile_fail.cpp
#if !defined(BOOST_DETAIL_CONTAINER_FWD_HPP)
#define BOOST_DETAIL_CONTAINER_FWD_HPP
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020) && \
+ !defined(BOOST_DETAIL_TEST_CONFIG_ONLY)
# pragma once
#endif
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#if defined(BOOST_DETAIL_NO_CONTAINER_FWD) \
- || ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
- && (defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL))) \
- || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
- || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
- || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) \
- || (defined(_LIBCPP_VERSION))
+#if !defined(BOOST_DETAIL_NO_CONTAINER_FWD)
+# if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+ // STLport
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# elif defined(__LIBCOMO__)
+ // Comeau STL:
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)
+ // Rogue Wave library:
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# elif defined(_LIBCPP_VERSION)
+ // libc++
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
+ // GNU libstdc++ 3
+# if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# endif
+# elif defined(__STL_CONFIG_H)
+ // generic SGI STL
+ //
+ // Forward declaration seems to be okay, but it has a copule of odd
+ // implementations.
+# define BOOST_CONTAINER_FWD_BAD_BITSET
+# if !defined(__STL_NON_TYPE_TMPL_PARAM_BUG)
+# define BOOST_CONTAINER_FWD_BAD_DEQUE
+# endif
+# elif defined(__MSL_CPP__)
+ // MSL standard lib:
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# elif defined(__IBMCPP__)
+ // The default VACPP std lib, forward declaration seems to be fine.
+# elif defined(MSIPL_COMPILE_H)
+ // Modena C++ standard library
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
+ // Dinkumware Library (this has to appear after any possible replacement
+ // libraries)
+ //
+ // Works fine.
+# else
+# define BOOST_DETAIL_NO_CONTAINER_FWD
+# endif
+#endif
+
+// BOOST_DETAIL_TEST_* macros are for testing only
+// and shouldn't be relied upon. But you can use
+// BOOST_DETAIL_NO_CONTAINER_FWD to prevent forward
+// declaration of containers.
+
+#if !defined(BOOST_DETAIL_TEST_CONFIG_ONLY)
+
+#if defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
+ !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)
#include <deque>
#include <list>
@@ -34,17 +84,6 @@
#include <cstddef>
-#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) && \
- defined(__STL_CONFIG_H)
-
-#define BOOST_CONTAINER_FWD_BAD_BITSET
-
-#if !defined(__STL_NON_TYPE_TMPL_PARAM_BUG)
-#define BOOST_CONTAINER_FWD_BAD_DEQUE
-#endif
-
-#endif
-
#if defined(BOOST_CONTAINER_FWD_BAD_DEQUE)
#include <deque>
#endif
@@ -74,11 +113,7 @@
#else
template <class T> class complex;
#endif
-}
-// gcc 3.4 and greater
-namespace std
-{
#if !defined(BOOST_CONTAINER_FWD_BAD_DEQUE)
template <class T, class Allocator> class deque;
#endif
@@ -101,6 +136,9 @@
#pragma warning(pop)
#endif
-#endif
+#endif // BOOST_DETAIL_NO_CONTAINER_FWD &&
+ // !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)
+
+#endif // BOOST_DETAIL_TEST_CONFIG_ONLY
#endif
Modified: branches/release/libs/detail/test/Jamfile
==============================================================================
--- branches/release/libs/detail/test/Jamfile (original)
+++ branches/release/libs/detail/test/Jamfile 2011-08-01 19:12:19 EDT (Mon, 01 Aug 2011)
@@ -5,6 +5,8 @@
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
################################################################################
+build-project container_fwd ;
+
project detail/test
: requirements
<toolset>clang:<cxxflags>-Wno-unused
Deleted: branches/release/libs/detail/test/container_fwd_test.cpp
==============================================================================
--- branches/release/libs/detail/test/container_fwd_test.cpp 2011-08-01 19:12:19 EDT (Mon, 01 Aug 2011)
+++ (empty file)
@@ -1,112 +0,0 @@
-
-// Copyright 2005-2009 Daniel James.
-// 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)
-
-#include <boost/functional/detail/container_fwd.hpp>
-
-#if BOOST_WORKAROUND(__GNUC__, < 3) && \
- !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
-template <class charT, class Allocator>
-static void test(
- std::basic_string<charT, std::string_char_traits<charT>, Allocator> const&)
-{
-}
-#else
-template <class charT, class Allocator>
-static void test(
- std::basic_string<charT, std::char_traits<charT>, Allocator> const&)
-{
-}
-#endif
-
-template <class T, class Allocator>
-static void test(std::deque<T, Allocator> const&)
-{
-}
-
-template <class T, class Allocator>
-static void test(std::list<T, Allocator> const&)
-{
-}
-
-template <class T, class Allocator>
-static void test(std::vector<T, Allocator> const&)
-{
-}
-
-template <class Key, class T, class Compare, class Allocator>
-static void test(std::map<Key, T, Compare, Allocator> const&)
-{
-}
-
-template <class Key, class T, class Compare, class Allocator>
-static void test(std::multimap<Key, T, Compare, Allocator> const&)
-{
-}
-
-template <class Key, class Compare, class Allocator>
-static void test(std::set<Key, Compare, Allocator> const&)
-{
-}
-
-template <class Key, class Compare, class Allocator>
-static void test(std::multiset<Key, Compare, Allocator> const&)
-{
-}
-
-template <std::size_t N>
-static void test(std::bitset<N> const&)
-{
-}
-
-template <class T>
-static void test(std::complex<T> const&)
-{
-}
-
-template <class X, class Y>
-static void test(std::pair<X, Y> const&)
-{
-}
-
-#include <deque>
-#include <list>
-#include <vector>
-#include <map>
-#include <set>
-#include <bitset>
-#include <string>
-#include <complex>
-#include <utility>
-
-int main()
-{
- std::deque<int> x1;
- std::list<std::string> x2;
- std::vector<float> x3;
- std::vector<bool> x4;
- std::map<int, int> x5;
- std::multimap<float, int*> x6;
- std::set<std::string> x7;
- std::multiset<std::vector<int> > x8;
- std::bitset<10> x9;
- std::string x10;
- std::complex<double> x11;
- std::pair<std::list<int>, char***> x12;
-
- test(x1);
- test(x2);
- test(x3);
- test(x4);
- test(x5);
- test(x6);
- test(x7);
- test(x8);
- test(x9);
- test(x10);
- test(x11);
- test(x12);
-
- return 0;
-}
Deleted: branches/release/libs/detail/test/container_no_fwd_test.cpp
==============================================================================
--- branches/release/libs/detail/test/container_no_fwd_test.cpp 2011-08-01 19:12:19 EDT (Mon, 01 Aug 2011)
+++ (empty file)
@@ -1,14 +0,0 @@
-
-// Copyright 2010 Daniel James.
-// 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)
-
-#define BOOST_DETAIL_NO_CONTAINER_FWD
-
-#include <boost/detail/container_fwd.hpp>
-
-int main()
-{
- std::set<int> x;
- std::vector<std::string> y;
-}
Modified: branches/release/status/explicit-failures-markup.xml
==============================================================================
--- branches/release/status/explicit-failures-markup.xml (original)
+++ branches/release/status/explicit-failures-markup.xml 2011-08-01 19:12:19 EDT (Mon, 01 Aug 2011)
@@ -1335,6 +1335,45 @@
</library>
+ <!-- detail -->
+ <library name="detail">
+ <mark-expected-failures>
+ <test name="correctly_disable"/>
+ <test name="correctly_disable_debug"/>
+ <toolset name="pathscale-4.*"/>
+ <toolset name="sun-5.10"/>
+ <toolset name="pgi-*"/>
+ <toolset name="msvc-9.0~stlport*"/>
+ <toolset name="msvc-9.0~wm5~stlport*"/>
+ <note author="Daniel James">
+ This indicates that forward declarations could probably be used
+ for these compilers but currently aren't. All these compilers use
+ STLport, which is compatible with forward declarations in some
+ circumstances, but not in others. I haven't looked into how to
+ determine this, so I've just set container_fwd to never forward
+ declare for STLport.
+ </note>
+ </mark-expected-failures>
+
+ <mark-expected-failures>
+ <test name="container_fwd"/>
+ <test name="container_fwd_debug"/>
+ <test name="container_no_fwd_test"/>
+ <toolset name="msvc-9.0~wm5~stlport5.2"/>
+ <note author="Daniel James">
+ Failing because these tests are run with warnings as errors,
+ and the standard library is causing warnings.
+ </note>
+ </mark-expected-failures>
+
+ <mark-expected-failures>
+ <test name="container_fwd_debug"/>
+ <toolset name="sun-5.10"/>
+ <note author="Daniel James">
+ STLport debug mode seems to be broken here.
+ </note>
+ </mark-expected-failures>
+ </library>
<!-- dynamic_bitset -->
<library name="dynamic_bitset">
@@ -2232,6 +2271,18 @@
ptrdiff_t, which is an alias for a 32-bit type
</note>
</mark-expected-failures>
+ <mark-expected-failures>
+ <test name="path_test_filesystem2"/>
+ <toolset name="msvc-7.1"/>
+ <note author="Daniel James" date="07 Jun 2011">
+ Visual C++ 7.1's SFINAE implementation can't deal with multiple
+ assignment functions with the same parameters (but disabled with
+ SFINAE). So path's assignment from boost::filesystem2::path is
+ disabled. Would be pretty easy to workaround, but probably not
+ worth it since this is pretty obscure, and filesystem2 will be
+ removed soon.
+ </note>
+ </mark-expected-failures>
</library>
<!-- lambda -->
@@ -5929,16 +5980,6 @@
a little inefficient.
</note>
</mark-expected-failures>
-
- <mark-expected-failures>
- <test name="compile_map"/>
- <test name="compile_set"/>
- <toolset name="gcc-open64"/>
- <toolset name="pathscale-*"/>
- <note author="Daniel James">
- Concept checks don't seem to work on pathscale.
- </note>
- </mark-expected-failures>
</library>
<!-- utility/enable_if -->
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