From 93583b9759ccdd4c41ab7f4d4d0286d0dd0b6c72 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 15 Aug 2012 23:04:49 +0000
Subject: [PATCH] Hash: Merge C++11 forward declaration fix.

[SVN r80054]
---
 .../hash/detail/container_fwd_0x.hpp          | 32 ++-----------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/include/boost/functional/hash/detail/container_fwd_0x.hpp b/include/boost/functional/hash/detail/container_fwd_0x.hpp
index 4e2dd7e..bed7730 100644
--- a/include/boost/functional/hash/detail/container_fwd_0x.hpp
+++ b/include/boost/functional/hash/detail/container_fwd_0x.hpp
@@ -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