boostorg/range
1
0
Fork 1
mirror of https://github.com/boostorg/range.git synced 2025-07-29 20:37:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from eldiener/develop

Browse Source 
Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74. Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost conf…
This commit is contained in:
Glen Fernandes
2020-05-11 13:00:07 -04:00
committed by GitHub
parent 4ed7887128 45d3aae111
commit 9a2960f01b
20 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/range/begin.hpp
View File

@ -24,7 +24,7 @@
namespace boost namespace boost
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
namespace range_detail namespace range_detail
{ {
#endif #endif
@ -81,7 +81,7 @@ namespace range_detail
} }
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
} // namespace 'range_detail' } // namespace 'range_detail'
#endif #endif
@ -97,7 +97,7 @@ BOOST_CONSTEXPR
#endif #endif
inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r ) inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
using namespace range_detail; using namespace range_detail;
#endif #endif
return range_begin( r ); return range_begin( r );
@ -109,7 +109,7 @@ BOOST_CONSTEXPR
#endif #endif
inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r ) inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
using namespace range_detail; using namespace range_detail;
#endif #endif
return range_begin( r ); return range_begin( r );

2
include/boost/range/concepts.hpp
View File

@ -84,7 +84,7 @@ namespace boost {
#endif #endif
#endif #endif
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0 #define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0
#endif #endif

2
include/boost/range/config.hpp
View File

@ -23,7 +23,7 @@
#error "macro already defined!" #error "macro already defined!"
#endif #endif
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# define BOOST_RANGE_DEDUCED_TYPENAME typename # define BOOST_RANGE_DEDUCED_TYPENAME typename
#else #else
#define BOOST_RANGE_DEDUCED_TYPENAME BOOST_DEDUCED_TYPENAME #define BOOST_RANGE_DEDUCED_TYPENAME BOOST_DEDUCED_TYPENAME

8
include/boost/range/end.hpp
View File

@ -26,7 +26,7 @@
namespace boost namespace boost
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
namespace range_detail namespace range_detail
{ {
#endif #endif
@ -78,7 +78,7 @@ namespace range_detail
return range_detail::array_end<T,sz>( a ); return range_detail::array_end<T,sz>( a );
} }
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
} // namespace 'range_detail' } // namespace 'range_detail'
#endif #endif
@ -91,7 +91,7 @@ BOOST_CONSTEXPR
#endif #endif
inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r ) inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
using namespace range_detail; using namespace range_detail;
#endif #endif
return range_end( r ); return range_end( r );
@ -103,7 +103,7 @@ BOOST_CONSTEXPR
#endif #endif
inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r ) inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
using namespace range_detail; using namespace range_detail;
#endif #endif
return range_end( r ); return range_end( r );

2
include/boost/range/size.hpp
View File

@ -62,7 +62,7 @@ namespace boost
BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<SinglePassRange>)); BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<SinglePassRange>));
#endif #endif
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \ #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__GNUC__, < 3) \ !BOOST_WORKAROUND(__GNUC__, < 3) \
/**/ /**/
using namespace range_detail; using namespace range_detail;

2
test/adl_conformance.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/algorithm_example.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

4
test/array.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif
@ -35,7 +35,7 @@ void check_array()
// BOOST_RANGE_NO_STATIC_ASSERT // BOOST_RANGE_NO_STATIC_ASSERT
#if !defined( __BORLANDC__ ) #if !defined( BOOST_BORLANDC )
#else #else
BOOST_STATIC_ASSERT(( is_same< range_value<array_t>::type, int >::value )); BOOST_STATIC_ASSERT(( is_same< range_value<array_t>::type, int >::value ));
BOOST_STATIC_ASSERT(( is_same< range_iterator<array_t>::type, int* >::value )); BOOST_STATIC_ASSERT(( is_same< range_iterator<array_t>::type, int* >::value ));

2
test/begin.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/const_ranges.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/end.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/extension_mechanism.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/extension_size.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/iterator_pair.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

4
test/iterator_range.cpp
View File

@ -12,7 +12,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif
@ -47,7 +47,7 @@ void check_iterator_range()
BOOST_CHECK( !r.empty() ); BOOST_CHECK( !r.empty() );
BOOST_CHECK( !r2.empty() ); BOOST_CHECK( !r2.empty() );
//#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) //#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
// if( !(bool)r ) // if( !(bool)r )
// BOOST_CHECK( false ); // BOOST_CHECK( false );
// if( !(bool)r2 ) // if( !(bool)r2 )

2
test/partial_workaround.cpp
View File

@ -13,7 +13,7 @@
#include <boost/range/detail/implementation_help.hpp> #include <boost/range/detail/implementation_help.hpp>
#include <boost/test/test_tools.hpp> #include <boost/test/test_tools.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/reversible_range.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/std_container.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

2
test/string.cpp
View File

@ -12,7 +12,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif

4
test/sub_range.cpp
View File

@ -11,7 +11,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# pragma warn -8091 // suppress warning in Boost.Test # pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test # pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif #endif
@ -65,7 +65,7 @@ void check_sub_range()
BOOST_CHECK_EQUAL( r.size(), s.size() ); BOOST_CHECK_EQUAL( r.size(), s.size() );
BOOST_CHECK_EQUAL( r2.size(), s2.size() ); BOOST_CHECK_EQUAL( r2.size(), s2.size() );
//#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) //#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
// if( !(bool)r ) // if( !(bool)r )
// BOOST_CHECK( false ); // BOOST_CHECK( false );
// if( !(bool)r2 ) // if( !(bool)r2 )