[Boost-commit] svn:boost r49340 - in trunk: boost/functional/hash libs/functional/hash/test

Subject: [Boost-commit] svn:boost r49340 - in trunk: boost/functional/hash libs/functional/hash/test
From: daniel_james_at_[hidden]
Date: 2008-10-15 06:26:56

Author: danieljames
Date: 2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
New Revision: 49340
URL: http://svn.boost.org/trac/boost/changeset/49340

Log:
Changed the warnings in the deprecated headers from 1.34.0 to errors. These
will be removed in a future version of Boost (probably 1.39.0).

Text files modified: 
   trunk/boost/functional/hash/deque.hpp      |    22 +---------------------                  
   trunk/boost/functional/hash/list.hpp       |    22 +---------------------                  
   trunk/boost/functional/hash/map.hpp        |    22 +---------------------                  
   trunk/boost/functional/hash/pair.hpp       |    22 +---------------------                  
   trunk/boost/functional/hash/set.hpp        |    22 +---------------------                  
   trunk/boost/functional/hash/vector.hpp     |    22 +---------------------                  
   trunk/libs/functional/hash/test/Jamfile.v2 |     2 +-                                      
   7 files changed, 7 insertions(+), 127 deletions(-)

Modified: trunk/boost/functional/hash/deque.hpp
==============================================================================
--- trunk/boost/functional/hash/deque.hpp	(original)
+++ trunk/boost/functional/hash/deque.hpp	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_DEQUE_HPP)
-#define BOOST_FUNCTIONAL_HASH_DEQUE_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/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: trunk/boost/functional/hash/list.hpp
==============================================================================
--- trunk/boost/functional/hash/list.hpp	(original)
+++ trunk/boost/functional/hash/list.hpp	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_LIST_HPP)
-#define BOOST_FUNCTIONAL_HASH_LIST_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/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: trunk/boost/functional/hash/map.hpp
==============================================================================
--- trunk/boost/functional/hash/map.hpp	(original)
+++ trunk/boost/functional/hash/map.hpp	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_MAP_HPP)
-#define BOOST_FUNCTIONAL_HASH_MAP_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/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: trunk/boost/functional/hash/pair.hpp
==============================================================================
--- trunk/boost/functional/hash/pair.hpp	(original)
+++ trunk/boost/functional/hash/pair.hpp	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_PAIR_HPP)
-#define BOOST_FUNCTIONAL_HASH_PAIR_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/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: trunk/boost/functional/hash/set.hpp
==============================================================================
--- trunk/boost/functional/hash/set.hpp	(original)
+++ trunk/boost/functional/hash/set.hpp	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_SET_HPP)
-#define BOOST_FUNCTIONAL_HASH_SET_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/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: trunk/boost/functional/hash/vector.hpp
==============================================================================
--- trunk/boost/functional/hash/vector.hpp	(original)
+++ trunk/boost/functional/hash/vector.hpp	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -3,25 +3,5 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  Based on Peter Dimov's proposal
-//  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
-//  issue 6.18. 
-
-#if !defined(BOOST_FUNCTIONAL_HASH_VECTOR_HPP)
-#define BOOST_FUNCTIONAL_HASH_VECTOR_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/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#elif defined(__GNUC__) || defined(__HP_aCC) || \
-    defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
-#endif
-
+#error "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
 #include <boost/functional/hash.hpp>
-
-#endif

Modified: trunk/libs/functional/hash/test/Jamfile.v2
==============================================================================
--- trunk/libs/functional/hash/test/Jamfile.v2	(original)
+++ trunk/libs/functional/hash/test/Jamfile.v2	2008-10-15 06:26:55 EDT (Wed, 15 Oct 2008)
@@ -40,7 +40,7 @@
         [ compile-fail hash_no_ext_fail_test.cpp ]
         [ run hash_no_ext_macro_1.cpp ]
         [ run hash_no_ext_macro_2.cpp ]
-        [ run hash_deprecated_headers.cpp : : : <test-info>always_show_run_output ]
+        [ compile-fail hash_deprecated_headers.cpp ]
     ;
 
 build-project ../examples ;