From 044d1f2cb95aba8c44e6d0186b71c1150f6feb00 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 25 Sep 2024 12:39:46 +0300 Subject: [PATCH] Remove uses of BOOST_NO_CXX11_HDR_FUNCTIONAL --- include/boost/smart_ptr/intrusive_ptr.hpp | 4 ---- include/boost/smart_ptr/local_shared_ptr.hpp | 4 ---- include/boost/smart_ptr/shared_ptr.hpp | 4 ---- include/boost/smart_ptr/weak_ptr.hpp | 4 ---- test/ip_hash_test2.cpp | 8 -------- test/lsp_hash_test2.cpp | 8 -------- test/sp_hash_test4.cpp | 8 -------- test/wp_hash_test2.cpp | 8 -------- 8 files changed, 48 deletions(-) diff --git a/include/boost/smart_ptr/intrusive_ptr.hpp b/include/boost/smart_ptr/intrusive_ptr.hpp index 3559f2e..ac181f2 100644 --- a/include/boost/smart_ptr/intrusive_ptr.hpp +++ b/include/boost/smart_ptr/intrusive_ptr.hpp @@ -304,8 +304,6 @@ template< class T > std::size_t hash_value( boost::intrusive_ptr const & p ) // std::hash -#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - namespace std { @@ -319,6 +317,4 @@ template struct hash< ::boost::intrusive_ptr > } // namespace std -#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - #endif // #ifndef BOOST_SMART_PTR_INTRUSIVE_PTR_HPP_INCLUDED diff --git a/include/boost/smart_ptr/local_shared_ptr.hpp b/include/boost/smart_ptr/local_shared_ptr.hpp index cc610b3..4a02b7a 100644 --- a/include/boost/smart_ptr/local_shared_ptr.hpp +++ b/include/boost/smart_ptr/local_shared_ptr.hpp @@ -630,8 +630,6 @@ template< class T > std::size_t hash_value( local_shared_ptr const & p ) BOOS // std::hash -#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - namespace std { @@ -645,6 +643,4 @@ template struct hash< ::boost::local_shared_ptr > } // namespace std -#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - #endif // #ifndef BOOST_SMART_PTR_LOCAL_SHARED_PTR_HPP_INCLUDED diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp index 278445d..bcf27aa 100644 --- a/include/boost/smart_ptr/shared_ptr.hpp +++ b/include/boost/smart_ptr/shared_ptr.hpp @@ -952,8 +952,6 @@ template< class T > std::size_t hash_value( boost::shared_ptr const & p ) BOO // std::hash -#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - namespace std { @@ -967,8 +965,6 @@ template struct hash< ::boost::shared_ptr > } // namespace std -#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - #include namespace boost diff --git a/include/boost/smart_ptr/weak_ptr.hpp b/include/boost/smart_ptr/weak_ptr.hpp index 5b393b4..d373541 100644 --- a/include/boost/smart_ptr/weak_ptr.hpp +++ b/include/boost/smart_ptr/weak_ptr.hpp @@ -248,8 +248,6 @@ template< class T > std::size_t hash_value( boost::weak_ptr const & p ) BOOST namespace std { -#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - template struct hash< ::boost::weak_ptr > { std::size_t operator()( ::boost::weak_ptr const & p ) const BOOST_SP_NOEXCEPT @@ -258,8 +256,6 @@ template struct hash< ::boost::weak_ptr > } }; -#endif // #if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - template struct equal_to< ::boost::weak_ptr > { bool operator()( ::boost::weak_ptr const & a, ::boost::weak_ptr const & b ) const BOOST_SP_NOEXCEPT diff --git a/test/ip_hash_test2.cpp b/test/ip_hash_test2.cpp index a9bf90f..b4f64e7 100644 --- a/test/ip_hash_test2.cpp +++ b/test/ip_hash_test2.cpp @@ -7,12 +7,6 @@ #include #include -#if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - -int main() {} - -#else - class base { private: @@ -63,5 +57,3 @@ int main() return boost::report_errors(); } - -#endif // #if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) diff --git a/test/lsp_hash_test2.cpp b/test/lsp_hash_test2.cpp index b42584d..ad1d03a 100644 --- a/test/lsp_hash_test2.cpp +++ b/test/lsp_hash_test2.cpp @@ -7,12 +7,6 @@ #include #include -#if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - -int main() {} - -#else - int main() { { @@ -38,5 +32,3 @@ int main() return boost::report_errors(); } - -#endif // #if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) diff --git a/test/sp_hash_test4.cpp b/test/sp_hash_test4.cpp index 0dd063b..e14b256 100644 --- a/test/sp_hash_test4.cpp +++ b/test/sp_hash_test4.cpp @@ -7,12 +7,6 @@ #include #include -#if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - -int main() {} - -#else - int main() { { @@ -38,5 +32,3 @@ int main() return boost::report_errors(); } - -#endif // #if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) diff --git a/test/wp_hash_test2.cpp b/test/wp_hash_test2.cpp index 77db2fd..a0ea33a 100644 --- a/test/wp_hash_test2.cpp +++ b/test/wp_hash_test2.cpp @@ -8,12 +8,6 @@ #include #include -#if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) - -int main() {} - -#else - int main() { { @@ -57,5 +51,3 @@ int main() return boost::report_errors(); } - -#endif // #if defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)