Subject: [Boost-commit] svn:boost r77672 - in branches/release: . boost boost/detail
From: dnljms_at_[hidden]
Date: 2012-03-31 15:34:56
Author: danieljames
Date: 2012-03-31 15:34:56 EDT (Sat, 31 Mar 2012)
New Revision: 77672
URL: http://svn.boost.org/trac/boost/changeset/77672
Log:
Detail: Merge macro to force container forwarding.
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/detail/ (props changed)
Text files modified:
branches/release/boost/detail/container_fwd.hpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
Modified: branches/release/boost/detail/container_fwd.hpp
==============================================================================
--- branches/release/boost/detail/container_fwd.hpp (original)
+++ branches/release/boost/detail/container_fwd.hpp 2012-03-31 15:34:56 EDT (Sat, 31 Mar 2012)
@@ -21,10 +21,17 @@
// Define BOOST_DETAIL_NO_CONTAINER_FWD if you don't want this header to //
// forward declare standard containers. //
// //
+// BOOST_DETAIL_CONTAINER_FWD to make it foward declare containers even if it //
+// normally doesn't. //
+// //
+// BOOST_DETAIL_NO_CONTAINER_FWD overrides BOOST_DETAIL_CONTAINER_FWD. //
+// //
////////////////////////////////////////////////////////////////////////////////
#if !defined(BOOST_DETAIL_NO_CONTAINER_FWD)
-# if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+# if defined(BOOST_DETAIL_CONTAINER_FWD)
+ // Force forward declarations.
+# elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
// STLport
# define BOOST_DETAIL_NO_CONTAINER_FWD
# elif defined(__LIBCOMO__)
@@ -76,11 +83,6 @@
# 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) && \
@@ -118,6 +120,7 @@
template <class charT, class traits, class Allocator> class basic_string;
#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+
template <class charT> struct string_char_traits;
#else
template <class charT> struct char_traits;