[Boost-commit] svn:boost r80054 - in branches/release: . boost boost/functional boost/functional/hash/detail

Subject: [Boost-commit] svn:boost r80054 - in branches/release: . boost boost/functional boost/functional/hash/detail
From: dnljms_at_[hidden]
Date: 2012-08-15 19:04:49

Author: danieljames
Date: 2012-08-15 19:04:49 EDT (Wed, 15 Aug 2012)
New Revision: 80054
URL: http://svn.boost.org/trac/boost/changeset/80054

Log:
Hash: Merge C++11 forward declaration fix.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/functional/   (props changed)
Text files modified: 
   branches/release/boost/functional/hash/detail/container_fwd_0x.hpp |    32 +++-----------------------------        
   1 files changed, 3 insertions(+), 29 deletions(-)

Modified: branches/release/boost/functional/hash/detail/container_fwd_0x.hpp
==============================================================================
--- branches/release/boost/functional/hash/detail/container_fwd_0x.hpp	(original)
+++ branches/release/boost/functional/hash/detail/container_fwd_0x.hpp	2012-08-15 19:04:49 EDT (Wed, 15 Aug 2012)
@@ -11,45 +11,19 @@
 // std::array
 
 #if !defined(BOOST_NO_CXX11_HDR_ARRAY)
-    // Don't forward declare std::array for Dinkumware, as it seems to be
-    // just 'using std::tr1::array'.
-#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
-        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
-        (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-#       include <array>
-#    else
-namespace std {
-    template <class, std::size_t> class array;
-}
-#    endif
+#   include <array>
 #endif
 
 // std::tuple
 
 #if !defined(BOOST_NO_CXX11_HDR_TUPLE)
-#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
-        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
-        defined(BOOST_NO_VARIADIC_TEMPLATES)
-#       include <tuple>
-#    else
-namespace std {
-    template <typename...> class tuple;
-}
-#    endif
+#   include <tuple>
 #endif
 
 // std::shared_ptr/std::unique_ptr
 
 #if !defined(BOOST_NO_CXX11_HDR_MEMORY)
-#   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
-        !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD))
-#       include <memory>
-#    else
-namespace std {
-    template <class> class shared_ptr;
-    template <class, class> class unique_ptr;
-}
-#    endif
+#   include <memory>
 #endif
 
 #endif