Subject: [Boost-commit] svn:boost r79544 - in branches/release: . boost boost/functional boost/functional/hash boost/functional/hash/detail libs libs/functional libs/functional/hash/test
From: dnljms_at_[hidden]
Date: 2012-07-15 19:28:31
Author: danieljames
Date: 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
New Revision: 79544
URL: http://svn.boost.org/trac/boost/changeset/79544
Log:
Hash: Merge update c++11 header macros.
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/hash/detail/container_fwd_0x.hpp | 4 ++--
branches/release/boost/functional/hash/extensions.hpp | 4 ++--
branches/release/boost/functional/hash/hash.hpp | 8 ++++----
branches/release/libs/functional/hash/test/hash_std_array_test.cpp | 2 +-
branches/release/libs/functional/hash/test/hash_std_tuple_test.cpp | 2 +-
branches/release/libs/functional/hash/test/hash_type_index_test.cpp | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
Modified: branches/release/boost/functional/hash/detail/container_fwd_0x.hpp
==============================================================================
--- branches/release/boost/functional/hash/detail/container_fwd_0x.hpp (original)
+++ branches/release/boost/functional/hash/detail/container_fwd_0x.hpp 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
@@ -10,7 +10,7 @@
// std::array
-#if !defined(BOOST_NO_0X_HDR_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) && \
@@ -26,7 +26,7 @@
// std::tuple
-#if !defined(BOOST_NO_0X_HDR_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)
Modified: branches/release/boost/functional/hash/extensions.hpp
==============================================================================
--- branches/release/boost/functional/hash/extensions.hpp (original)
+++ branches/release/boost/functional/hash/extensions.hpp 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
@@ -114,7 +114,7 @@
return seed;
}
-#if !defined(BOOST_NO_0X_HDR_ARRAY)
+#if !defined(BOOST_NO_CXX11_HDR_ARRAY)
template <class T, std::size_t N>
std::size_t hash_value(std::array<T, N> const& v)
{
@@ -122,7 +122,7 @@
}
#endif
-#if !defined(BOOST_NO_0X_HDR_TUPLE)
+#if !defined(BOOST_NO_CXX11_HDR_TUPLE)
namespace hash_detail {
template <std::size_t I, typename T>
inline typename boost::enable_if_c<(I == std::tuple_size<T>::value),
Modified: branches/release/boost/functional/hash/hash.hpp
==============================================================================
--- branches/release/boost/functional/hash/hash.hpp (original)
+++ branches/release/boost/functional/hash/hash.hpp 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
@@ -20,7 +20,7 @@
#include <boost/type_traits/is_pointer.hpp>
#endif
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
#include <typeindex>
#endif
@@ -111,7 +111,7 @@
template <typename T>
typename boost::hash_detail::float_numbers<T>::type hash_value(T);
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
std::size_t hash_value(std::type_index);
#endif
@@ -299,7 +299,7 @@
return boost::hash_detail::float_hash_value(v);
}
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
inline std::size_t hash_value(std::type_index v)
{
return v.hash_code();
@@ -410,7 +410,7 @@
BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
#endif
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
BOOST_HASH_SPECIALIZE(std::type_index)
#endif
Modified: branches/release/libs/functional/hash/test/hash_std_array_test.cpp
==============================================================================
--- branches/release/libs/functional/hash/test/hash_std_array_test.cpp (original)
+++ branches/release/libs/functional/hash/test/hash_std_array_test.cpp 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
@@ -16,7 +16,7 @@
#include <boost/config.hpp>
#include <boost/detail/lightweight_test.hpp>
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_ARRAY)
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY)
#define TEST_ARRAY
#include <array>
#include <vector>
Modified: branches/release/libs/functional/hash/test/hash_std_tuple_test.cpp
==============================================================================
--- branches/release/libs/functional/hash/test/hash_std_tuple_test.cpp (original)
+++ branches/release/libs/functional/hash/test/hash_std_tuple_test.cpp 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
@@ -16,7 +16,7 @@
#include <boost/config.hpp>
#include <boost/detail/lightweight_test.hpp>
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_TUPLE)
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
#define TEST_TUPLE
#include <tuple>
#include <vector>
Modified: branches/release/libs/functional/hash/test/hash_type_index_test.cpp
==============================================================================
--- branches/release/libs/functional/hash/test/hash_type_index_test.cpp (original)
+++ branches/release/libs/functional/hash/test/hash_type_index_test.cpp 2012-07-15 19:28:30 EDT (Sun, 15 Jul 2012)
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
#include <boost/detail/lightweight_test.hpp>
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
#include <typeindex>
@@ -43,7 +43,7 @@
int main()
{
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
test_type_index();
#else
std::cout<<"<type_index> not available."<<std::endl;