From 5a68a35866b7bd47200e3fabe62844e476f15035 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 4 Jan 2024 17:30:08 +0200 Subject: [PATCH] Update boost/detail includes --- test/mem_fn_dm_test.cpp | 13 +------------ test/mem_fn_eq_test.cpp | 13 +------------ test/mem_fn_ref_test.cpp | 2 +- test/mem_fn_unary_addr_test.cpp | 19 ------------------- test/ref_fn_test.cpp | 2 +- 5 files changed, 4 insertions(+), 45 deletions(-) diff --git a/test/mem_fn_dm_test.cpp b/test/mem_fn_dm_test.cpp index 88fe428d9..d958ef0aa 100644 --- a/test/mem_fn_dm_test.cpp +++ b/test/mem_fn_dm_test.cpp @@ -18,18 +18,7 @@ // #include - -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(push, 3) -#endif - -#include - -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(pop) -#endif - -#include +#include struct X { diff --git a/test/mem_fn_eq_test.cpp b/test/mem_fn_eq_test.cpp index 544d6ff45..7611a9a16 100644 --- a/test/mem_fn_eq_test.cpp +++ b/test/mem_fn_eq_test.cpp @@ -18,18 +18,7 @@ // #include - -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(push, 3) -#endif - -#include - -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(pop) -#endif - -#include +#include struct X { diff --git a/test/mem_fn_ref_test.cpp b/test/mem_fn_ref_test.cpp index be989414e..08382b8db 100644 --- a/test/mem_fn_ref_test.cpp +++ b/test/mem_fn_ref_test.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include struct X { diff --git a/test/mem_fn_unary_addr_test.cpp b/test/mem_fn_unary_addr_test.cpp index cd6323913..99160a454 100644 --- a/test/mem_fn_unary_addr_test.cpp +++ b/test/mem_fn_unary_addr_test.cpp @@ -1,5 +1,4 @@ #include -#include #if defined(BOOST_MSVC) #pragma warning(disable: 4786) // identifier truncated in debug info @@ -19,17 +18,8 @@ // #include - -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(push, 3) -#endif - #include -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(pop) -#endif - unsigned int hash = 0; struct X @@ -83,20 +73,11 @@ template class Y } }; -#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) ) -namespace boost -{ -#endif - template T * get_pointer( Y< T > const & y ) { return y.get(); } -#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) ) -} // namespace boost -#endif - int detect_errors(bool x) { if( x ) diff --git a/test/ref_fn_test.cpp b/test/ref_fn_test.cpp index aec54e828..be13824c0 100644 --- a/test/ref_fn_test.cpp +++ b/test/ref_fn_test.cpp @@ -16,7 +16,7 @@ // http://www.boost.org/LICENSE_1_0.txt #include -#include +#include void f0()