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

This commit is contained in:
Edward Diener
2020-03-30 14:04:35 -04:00
parent d4a4a5b6ad
commit 78d6563bce
42 changed files with 43 additions and 43 deletions

View File

@ -79,7 +79,7 @@ class optional_base : public optional_tag
private : private :
typedef typedef
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
BOOST_DEDUCED_TYPENAME BOOST_DEDUCED_TYPENAME
#endif #endif
::boost::detail::make_reference_content<T>::type internal_type ; ::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_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() ; } 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 ; } void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; }
#else #else
void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; } void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; }

View File

@ -28,7 +28,7 @@
# define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
#endif #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. // BCB (5.5.1) cannot parse the nested template struct in an inplace factory.
# define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
#endif #endif

View File

@ -13,7 +13,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -24,7 +24,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -13,7 +13,7 @@
#include<string> #include<string>
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -13,7 +13,7 @@
#include<string> #include<string>
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -13,7 +13,7 @@
#include<string> #include<string>
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -14,7 +14,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#include "boost/optional/optional_io.hpp" #include "boost/optional/optional_io.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -12,7 +12,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -12,7 +12,7 @@
#define BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES #define BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -12,7 +12,7 @@
#include "boost/static_assert.hpp" #include "boost/static_assert.hpp"
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -12,7 +12,7 @@
#define BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL // does old implementation still work for basic usage? #define BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL // does old implementation still work for basic usage?
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -12,7 +12,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -17,7 +17,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#include "boost/utility/in_place_factory.hpp" #include "boost/utility/in_place_factory.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -12,7 +12,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

@ -11,7 +11,7 @@
#include "boost/optional/optional.hpp" #include "boost/optional/optional.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif