boostorg/functional
1
0
Fork 1
mirror of https://github.com/boostorg/functional.git synced 2025-08-01 21:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch from deprecated macros to new shiny ones; no functionality change

Browse Source 
[SVN r79392]
This commit is contained in:
Marshall Clow
2012-07-09 20:12:04 +00:00
parent 769ec4369d
commit e723967c7e
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hash/test/hash_std_array_test.cpp
View File

@@ -16,7 +16,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/detail/lightweight_test.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 #define TEST_ARRAY
#include <array> #include <array>
#include <vector> #include <vector>

2
hash/test/hash_std_tuple_test.cpp
View File

@@ -16,7 +16,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/detail/lightweight_test.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 #define TEST_TUPLE
#include <tuple> #include <tuple>
#include <vector> #include <vector>

4
hash/test/hash_type_index_test.cpp
View File

@@ -13,7 +13,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/detail/lightweight_test.hpp> #include <boost/detail/lightweight_test.hpp>
#if !defined(BOOST_NO_0X_HDR_TYPEINDEX) #if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
#include <typeindex> #include <typeindex>
@@ -43,7 +43,7 @@ void test_type_index() {
int main() int main()
{ {
#if !defined(BOOST_NO_0X_HDR_TYPEINDEX) #if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
test_type_index(); test_type_index();
#else #else
std::cout<<"<type_index> not available."<<std::endl; std::cout<<"<type_index> not available."<<std::endl;

4
include/boost/functional/hash/detail/container_fwd_0x.hpp
View File

@@ -10,7 +10,7 @@
// std::array // 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 // Don't forward declare std::array for Dinkumware, as it seems to be
// just 'using std::tr1::array'. // just 'using std::tr1::array'.
# if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \ # if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
@@ -26,7 +26,7 @@ namespace std {
// std::tuple // std::tuple
#if !defined(BOOST_NO_0X_HDR_TUPLE) #if !defined(BOOST_NO_CXX11_HDR_TUPLE)
# if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \ # if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
!defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \ !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
defined(BOOST_NO_VARIADIC_TEMPLATES) defined(BOOST_NO_VARIADIC_TEMPLATES)

4
include/boost/functional/hash/extensions.hpp
View File

@@ -114,7 +114,7 @@ namespace boost
return seed; return seed;
} }
#if !defined(BOOST_NO_0X_HDR_ARRAY) #if !defined(BOOST_NO_CXX11_HDR_ARRAY)
template <class T, std::size_t N> template <class T, std::size_t N>
std::size_t hash_value(std::array<T, N> const& v) std::size_t hash_value(std::array<T, N> const& v)
{ {
@@ -122,7 +122,7 @@ namespace boost
} }
#endif #endif
#if !defined(BOOST_NO_0X_HDR_TUPLE) #if !defined(BOOST_NO_CXX11_HDR_TUPLE)
namespace hash_detail { namespace hash_detail {
template <std::size_t I, typename T> template <std::size_t I, typename T>
inline typename boost::enable_if_c<(I == std::tuple_size<T>::value), inline typename boost::enable_if_c<(I == std::tuple_size<T>::value),

8
include/boost/functional/hash/hash.hpp
View File

@@ -20,7 +20,7 @@
#include <boost/type_traits/is_pointer.hpp> #include <boost/type_traits/is_pointer.hpp>
#endif #endif
#if !defined(BOOST_NO_0X_HDR_TYPEINDEX) #if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
#include <typeindex> #include <typeindex>
#endif #endif
@@ -111,7 +111,7 @@ namespace boost
template <typename T> template <typename T>
typename boost::hash_detail::float_numbers<T>::type hash_value(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); std::size_t hash_value(std::type_index);
#endif #endif
@@ -299,7 +299,7 @@ namespace boost
return boost::hash_detail::float_hash_value(v); 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) inline std::size_t hash_value(std::type_index v)
{ {
return v.hash_code(); return v.hash_code();
@@ -410,7 +410,7 @@ namespace boost
BOOST_HASH_SPECIALIZE(boost::ulong_long_type) BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
#endif #endif
#if !defined(BOOST_NO_0X_HDR_TYPEINDEX) #if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
BOOST_HASH_SPECIALIZE(std::type_index) BOOST_HASH_SPECIALIZE(std::type_index)
#endif #endif