From a186aa979aa37189e15ca8a74382e200de80dcb5 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 5 Nov 2008 13:30:43 +0000 Subject: [PATCH] Merge error messages for old hash headers. Merged revisions 49339-49341,49541 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r49339 | danieljames | 2008-10-15 11:25:07 +0100 (Wed, 15 Oct 2008) | 1 line Note about change in boost 1.37. ........ r49340 | danieljames | 2008-10-15 11:26:55 +0100 (Wed, 15 Oct 2008) | 4 lines 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). ........ r49341 | danieljames | 2008-10-15 11:34:15 +0100 (Wed, 15 Oct 2008) | 2 lines Add note about changes to deprecated headers. Refs #2412. ........ r49541 | danieljames | 2008-11-02 22:32:00 +0000 (Sun, 02 Nov 2008) | 3 lines Slightly more accurated comment - now that the headers cause errors, they've moved past the deprecation stage (I think). ........ [SVN r49597] --- hash/doc/changes.qbk | 11 +++++++++++ hash/test/Jamfile.v2 | 2 +- include/boost/functional/hash/deque.hpp | 22 +--------------------- include/boost/functional/hash/list.hpp | 22 +--------------------- include/boost/functional/hash/map.hpp | 22 +--------------------- include/boost/functional/hash/pair.hpp | 22 +--------------------- include/boost/functional/hash/set.hpp | 22 +--------------------- include/boost/functional/hash/vector.hpp | 22 +--------------------- 8 files changed, 18 insertions(+), 127 deletions(-) diff --git a/hash/doc/changes.qbk b/hash/doc/changes.qbk index 0288804..4d0515a 100644 --- a/hash/doc/changes.qbk +++ b/hash/doc/changes.qbk @@ -59,4 +59,15 @@ * Using the boost typedefs for `long long` and `unsigned long long`. * Move the extensions into their own header. +[h2 Boost 1.37.0] + +* [@http://svn.boost.org/trac/boost/ticket/2264 Ticket 2264]: + In Visual C++, always use C99 float functions for `long double` and `float` as + the C++ overloads aren't always availables. + +[h2 Boost 1.38.0] + +* Changed the warnings in the deprecated headers from 1.34.0 to errors. These + will be removed in a future version of Boost. + [endsect] diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2 index da8a0f9..2f771b3 100644 --- a/hash/test/Jamfile.v2 +++ b/hash/test/Jamfile.v2 @@ -40,7 +40,7 @@ test-suite functional/hash [ 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 : : : always_show_run_output ] + [ compile-fail hash_deprecated_headers.cpp ] ; build-project ../examples ; diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp index 06d23c2..0dd8b99 100644 --- a/include/boost/functional/hash/deque.hpp +++ b/include/boost/functional/hash/deque.hpp @@ -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 no longer supported, use boost/functional/hash.hpp instead." #include - -#endif diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp index 201f6d0..61e7b6d 100644 --- a/include/boost/functional/hash/list.hpp +++ b/include/boost/functional/hash/list.hpp @@ -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 no longer supported, use boost/functional/hash.hpp instead." #include - -#endif diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp index 6713d85..2dcd58b 100644 --- a/include/boost/functional/hash/map.hpp +++ b/include/boost/functional/hash/map.hpp @@ -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 no longer supported, use boost/functional/hash.hpp instead." #include - -#endif diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp index bf076f1..d771460 100644 --- a/include/boost/functional/hash/pair.hpp +++ b/include/boost/functional/hash/pair.hpp @@ -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 no longer supported, use boost/functional/hash.hpp instead." #include - -#endif diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp index 0533e76..e85f80d 100644 --- a/include/boost/functional/hash/set.hpp +++ b/include/boost/functional/hash/set.hpp @@ -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 no longer supported, use boost/functional/hash.hpp instead." #include - -#endif diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp index 8bab799..7fe2be6 100644 --- a/include/boost/functional/hash/vector.hpp +++ b/include/boost/functional/hash/vector.hpp @@ -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 no longer supported, use boost/functional/hash.hpp instead." #include - -#endif