From ffff25ac00ecb5d4fc61e5caa42a35797a8b2b24 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Thu, 16 Apr 2020 10:47:58 -0400 Subject: [PATCH] Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. (#54) --- include/boost/dynamic_bitset/config.hpp | 2 +- test/bitset_test.hpp | 2 +- test/dyn_bitset_unit_tests4.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/dynamic_bitset/config.hpp b/include/boost/dynamic_bitset/config.hpp index 1e6d9f7..ade19d4 100644 --- a/include/boost/dynamic_bitset/config.hpp +++ b/include/boost/dynamic_bitset/config.hpp @@ -34,7 +34,7 @@ namespace boost { namespace detail { #endif // -#if (defined __BORLANDC__ && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))) \ +#if (defined BOOST_BORLANDC && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))) \ || (defined BOOST_NO_MEMBER_TEMPLATE_FRIENDS) #define BOOST_DYNAMIC_BITSET_DONT_USE_FRIENDS #endif diff --git a/test/bitset_test.hpp b/test/bitset_test.hpp index 669aca5..0b42069 100644 --- a/test/bitset_test.hpp +++ b/test/bitset_test.hpp @@ -34,7 +34,7 @@ template inline bool nth_bit(Block num, std::size_t n) { #ifndef NDEBUG -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC // Borland deduces Block as a const qualified type, // and thus finds numeric_limits to be zero :( // (though not directly relevant here, see also diff --git a/test/dyn_bitset_unit_tests4.cpp b/test/dyn_bitset_unit_tests4.cpp index 413fddd..0dad708 100644 --- a/test/dyn_bitset_unit_tests4.cpp +++ b/test/dyn_bitset_unit_tests4.cpp @@ -191,7 +191,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) ) // (in Tests::stream_extractor instantiation) -#if !(defined __BORLANDC__ \ +#if !(defined BOOST_BORLANDC \ && BOOST_WORKAROUND(BOOST_RWSTD_VER, BOOST_TESTED_AT(0x20101))) // Borland 5.5.1 with RW library crashes // empty string