Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers.

2025-07-14 21:06:37 +02:00 · 2020-03-30 14:04:35 -04:00
parent d4a4a5b6ad
commit 78d6563bce
42 changed files with 43 additions and 43 deletions
--- a/include/boost/optional/detail/old_optional_implementation.hpp
+++ b/include/boost/optional/detail/old_optional_implementation.hpp
@ -79,7 +79,7 @@ class optional_base : public optional_tag
  private :

    typedef
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
    BOOST_DEDUCED_TYPENAME
 #endif
    ::boost::detail::make_reference_content<T>::type internal_type ;
@ -619,7 +619,7 @@ class optional_base : public optional_tag
    reference_const_type dereference( internal_type const* p, is_reference_tag     ) const { return p->get() ; }
    reference_type       dereference( internal_type*       p, is_reference_tag     )       { return p->get() ; }

-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581))
    void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; }
 #else
    void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; }
--- a/include/boost/optional/detail/optional_config.hpp
+++ b/include/boost/optional/detail/optional_config.hpp
@ -28,7 +28,7 @@
 # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 #endif

-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x551)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x551)
 // BCB (5.5.1) cannot parse the nested template struct in an inplace factory.
 # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 #endif
--- a/test/optional_ref_assign_test_defs.hpp
+++ b/test/optional_ref_assign_test_defs.hpp
@ -13,7 +13,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test.cpp
+++ b/test/optional_test.cpp
@ -24,7 +24,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_conversions_from_U.cpp
+++ b/test/optional_test_conversions_from_U.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_convert_from_T.cpp
+++ b/test/optional_test_convert_from_T.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_emplace.cpp
+++ b/test/optional_test_emplace.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_empty_braces.cpp
+++ b/test/optional_test_empty_braces.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_equals_none.cpp
+++ b/test/optional_test_equals_none.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_experimental_traits.cpp
+++ b/test/optional_test_experimental_traits.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_flat_map.cpp
+++ b/test/optional_test_flat_map.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_inplace_factory.cpp
+++ b/test/optional_test_inplace_factory.cpp
@ -13,7 +13,7 @@
 #include<string>
 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_inplace_fail.cpp
+++ b/test/optional_test_inplace_fail.cpp
@ -13,7 +13,7 @@
 #include<string>
 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_inplace_fail2.cpp
+++ b/test/optional_test_inplace_fail2.cpp
@ -13,7 +13,7 @@
 #include<string>
 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_io.cpp
+++ b/test/optional_test_io.cpp
@ -14,7 +14,7 @@
 #include "boost/optional/optional.hpp"
 #include "boost/optional/optional_io.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_make_optional.cpp
+++ b/test/optional_test_make_optional.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_map.cpp
+++ b/test/optional_test_map.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_maybe_uninitialized_warning.cpp
+++ b/test/optional_test_maybe_uninitialized_warning.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_member_T.cpp
+++ b/test/optional_test_member_T.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_minimum_requirements.cpp
+++ b/test/optional_test_minimum_requirements.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_move.cpp
+++ b/test/optional_test_move.cpp
@ -12,7 +12,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_msvc_bug_workaround.cpp
+++ b/test/optional_test_msvc_bug_workaround.cpp
@ -12,7 +12,7 @@
 #define BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES
 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_noexcept_move.cpp
+++ b/test/optional_test_noexcept_move.cpp
@ -12,7 +12,7 @@
 #include "boost/static_assert.hpp"
 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_old_impl.cpp
+++ b/test/optional_test_old_impl.cpp
@ -12,7 +12,7 @@
 #define BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL // does old implementation still work for basic usage?
 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_path_assignment.cpp
+++ b/test/optional_test_path_assignment.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_assign_const_int.cpp
+++ b/test/optional_test_ref_assign_const_int.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_assign_mutable_int.cpp
+++ b/test/optional_test_ref_assign_mutable_int.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_assign_portable_minimum.cpp
+++ b/test/optional_test_ref_assign_portable_minimum.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_convert_assign_const_int.cpp
+++ b/test/optional_test_ref_convert_assign_const_int.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_convert_assign_const_int_prevented.cpp
+++ b/test/optional_test_ref_convert_assign_const_int_prevented.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_convert_assign_mutable_int.cpp
+++ b/test/optional_test_ref_convert_assign_mutable_int.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_convert_assign_non_int.cpp
+++ b/test/optional_test_ref_convert_assign_non_int.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_converting_ctor.cpp
+++ b/test/optional_test_ref_converting_ctor.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_move.cpp
+++ b/test/optional_test_ref_move.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_portable_minimum.cpp
+++ b/test/optional_test_ref_portable_minimum.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_ref_to_val.cpp
+++ b/test/optional_test_ref_to_val.cpp
@ -12,7 +12,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_sfinae_friendly_ctor.cpp
+++ b/test/optional_test_sfinae_friendly_ctor.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_static_properties.cpp
+++ b/test/optional_test_static_properties.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_swap.cpp
+++ b/test/optional_test_swap.cpp
@ -17,7 +17,7 @@
 #include "boost/optional/optional.hpp"
 #include "boost/utility/in_place_factory.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_tc_base.cpp
+++ b/test/optional_test_tc_base.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_tie.cpp
+++ b/test/optional_test_tie.cpp
@ -12,7 +12,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif

--- a/test/optional_test_value_access.cpp
+++ b/test/optional_test_value_access.cpp
@ -11,7 +11,7 @@

 #include "boost/optional/optional.hpp"

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif