From ff205e1e8ddc03f401b5a51e5b7960d2e5b92310 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 28 Aug 2012 17:38:30 +0000
Subject: [PATCH] Merge #error for deperectaed
 `boost/functional/detail/container_fwd.hpp`

[SVN r80286]
---
 hash/test/Jamfile.v2                          |  2 +-
 hash/test/deprecated_container_fwd.cpp        |  8 --------
 .../boost/functional/detail/container_fwd.hpp | 19 +------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index fc731d2..07df1a0 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -51,7 +51,7 @@ test-suite functional/hash
         [ run implicit_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
-        [ compile deprecated_container_fwd.cpp ]
+        [ compile-fail deprecated_container_fwd.cpp ]
     ;
 
 test-suite functional/hash_no_ext
diff --git a/hash/test/deprecated_container_fwd.cpp b/hash/test/deprecated_container_fwd.cpp
index 1c6e12b..8238bda 100644
--- a/hash/test/deprecated_container_fwd.cpp
+++ b/hash/test/deprecated_container_fwd.cpp
@@ -4,11 +4,3 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/detail/container_fwd.hpp>
-
-typedef std::vector<int, std::allocator<int> > int_vector;
-
-#include <vector>
-
-int main() {
-    int_vector x;
-}
diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index e2bf865..6970472 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -7,21 +7,4 @@
 // This header is deprecated, I'll change the warning to an error in a future
 // release, and then later remove the header completely.
 
-#if !defined(BOOST_FUNCTIONAL_DETAIL_CONTAINER_FWD_HPP)
-#define BOOST_FUNCTIONAL_DETAIL_CONTAINER_FWD_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#if defined(__EDG__)
-#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#pragma message("Warning: boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead."
-#endif
-
-#include <boost/detail/container_fwd.hpp>
-
-#endif
+#error "boost/functional/detail/container_fwd.hpp is deprecated, use boost/detail/container_fwd.hpp instead."