From 87ff02bf7987fda1972d26a6507ec71e8580b34b Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Mon, 30 Mar 2020 13:31:11 -0400
Subject: [PATCH 1/2] Change __BORLANDC__ to BOOST_BORLANDC, which is defined
 in Boost config for the Embarcadero non-clang-based compilers.

---
 include/boost/tuple/detail/tuple_basic.hpp | 2 +-
 include/boost/tuple/tuple_io.hpp           | 2 +-
 test/tuple_test_bench.cpp                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/tuple/detail/tuple_basic.hpp b/include/boost/tuple/detail/tuple_basic.hpp
index 7e5dddc..bed3042 100644
--- a/include/boost/tuple/detail/tuple_basic.hpp
+++ b/include/boost/tuple/detail/tuple_basic.hpp
@@ -141,7 +141,7 @@ private:
   typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
       apply<T>::type::head_type unqualified_type;
 public:
-#if BOOST_WORKAROUND(__BORLANDC__,<0x600)
+#if BOOST_WORKAROUND(BOOST_BORLANDC,<0x600)
   typedef const unqualified_type type;
 #else
   typedef BOOST_DEDUCED_TYPENAME boost::add_const<unqualified_type>::type type;
diff --git a/include/boost/tuple/tuple_io.hpp b/include/boost/tuple/tuple_io.hpp
index 505bd9d..ce55170 100644
--- a/include/boost/tuple/tuple_io.hpp
+++ b/include/boost/tuple/tuple_io.hpp
@@ -259,7 +259,7 @@ extract_and_check_delimiter(
 
 #if defined (BOOST_NO_STD_LOCALE)
   const bool is_delimiter = !isspace(d);
-#elif defined ( __BORLANDC__ )
+#elif defined ( BOOST_BORLANDC )
   const bool is_delimiter = !std::use_facet< std::ctype< CharType > >
     (is.getloc() ).is( std::ctype_base::space, d);
 #else
diff --git a/test/tuple_test_bench.cpp b/test/tuple_test_bench.cpp
index c08d6df..1d74b93 100644
--- a/test/tuple_test_bench.cpp
+++ b/test/tuple_test_bench.cpp
@@ -81,7 +81,7 @@ typedef tuple<std::string, std::pair<A, B> > t4;
 typedef tuple<A*, tuple<const A*, const B&, C>, bool, void*> t5;
 typedef tuple<volatile int, const volatile char&, int(&)(float) > t6;
 
-# if !defined(__BORLANDC__) || __BORLAND__ > 0x0551
+# if !defined(BOOST_BORLANDC) || __BORLAND__ > 0x0551
 typedef tuple<B(A::*)(C&), A&> t7;
 #endif
 
@@ -306,7 +306,7 @@ make_tuple_test()
   
 // With function pointers, make_tuple works just fine
 
-#if !defined(__BORLANDC__) || __BORLAND__ > 0x0551
+#if !defined(BOOST_BORLANDC) || __BORLAND__ > 0x0551
    make_tuple(&make_tuple_test);
 #endif
       

From c4addf979559d00c97e2686d24dab03dd6e5374a Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Wed, 8 Apr 2020 17:48:25 -0400
Subject: [PATCH 2/2] Corrected previous fix.

---
 test/tuple_test_bench.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/tuple_test_bench.cpp b/test/tuple_test_bench.cpp
index 1d74b93..3f44027 100644
--- a/test/tuple_test_bench.cpp
+++ b/test/tuple_test_bench.cpp
@@ -81,7 +81,7 @@ typedef tuple<std::string, std::pair<A, B> > t4;
 typedef tuple<A*, tuple<const A*, const B&, C>, bool, void*> t5;
 typedef tuple<volatile int, const volatile char&, int(&)(float) > t6;
 
-# if !defined(BOOST_BORLANDC) || __BORLAND__ > 0x0551
+# if !defined(BOOST_BORLANDC) || BOOST_BORLANDC > 0x0551
 typedef tuple<B(A::*)(C&), A&> t7;
 #endif
 
@@ -306,7 +306,7 @@ make_tuple_test()
   
 // With function pointers, make_tuple works just fine
 
-#if !defined(BOOST_BORLANDC) || __BORLAND__ > 0x0551
+#if !defined(BOOST_BORLANDC) || BOOST_BORLANDC > 0x0551
    make_tuple(&make_tuple_test);
 #endif