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

Subject: [Boost-commit] svn:boost r80286 - in branches/release: . boost boost/functional boost/functional/detail libs libs/functional libs/functional/hash/test
From: dnljms_at_[hidden]
Date: 2012-08-28 13:38:31

Author: danieljames
Date: 2012-08-28 13:38:30 EDT (Tue, 28 Aug 2012)
New Revision: 80286
URL: http://svn.boost.org/trac/boost/changeset/80286

Log:
Merge #error for deperectaed `boost/functional/detail/container_fwd.hpp`
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/functional/   (props changed)
   branches/release/libs/   (props changed)
   branches/release/libs/functional/   (props changed)
Text files modified: 
   branches/release/boost/functional/detail/container_fwd.hpp              |    19 +------------------                     
   branches/release/libs/functional/hash/test/Jamfile.v2                   |     2 +-                                      
   branches/release/libs/functional/hash/test/deprecated_container_fwd.cpp |     8 --------                                
   3 files changed, 2 insertions(+), 27 deletions(-)

Modified: branches/release/boost/functional/detail/container_fwd.hpp
==============================================================================
--- branches/release/boost/functional/detail/container_fwd.hpp	(original)
+++ branches/release/boost/functional/detail/container_fwd.hpp	2012-08-28 13:38:30 EDT (Tue, 28 Aug 2012)
@@ -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."

Modified: branches/release/libs/functional/hash/test/Jamfile.v2
==============================================================================
--- branches/release/libs/functional/hash/test/Jamfile.v2	(original)
+++ branches/release/libs/functional/hash/test/Jamfile.v2	2012-08-28 13:38:30 EDT (Tue, 28 Aug 2012)
@@ -51,7 +51,7 @@
         [ 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

Modified: branches/release/libs/functional/hash/test/deprecated_container_fwd.cpp
==============================================================================
--- branches/release/libs/functional/hash/test/deprecated_container_fwd.cpp	(original)
+++ branches/release/libs/functional/hash/test/deprecated_container_fwd.cpp	2012-08-28 13:38:30 EDT (Tue, 28 Aug 2012)
@@ -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;
-}