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

eldiener · stefanseefeld · commit 17886fc2960d · 2020-08-07T17:35:12.000-04:00
diff --git a/include/boost/python/def_visitor.hpp b/include/boost/python/def_visitor.hpp
@@ -16,7 +16,7 @@ template <class T, class X1, class X2, class X3> class class_;
 class def_visitor_access
 {
 # if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
     // Tasteless as this may seem, making all members public allows member templates
     // to work in the absence of member template friends.
  public:
@@ -52,7 +52,7 @@ class def_visitor
     friend class def_visitor_access;
     
 # if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
+    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
     // Tasteless as this may seem, making all members public allows member templates
     // to work in the absence of member template friends.
  public:
diff --git a/include/boost/python/detail/msvc_typeinfo.hpp b/include/boost/python/detail/msvc_typeinfo.hpp
@@ -47,7 +47,7 @@ inline typeinfo typeid_ref(type<T>*, ...)
     return detail::typeid_ref_1((T(*)())0);
 }
 
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32))
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && !defined(BOOST_DISABLE_WIN32))
 #   define BOOST_PYTT_DECL __cdecl
 #else
 #   define BOOST_PYTT_DECL /**/
diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp
@@ -146,7 +146,7 @@ typedef int pid_t;
 
 #  undef hypot // undo the evil #define left by Python.
 
-# elif defined(__BORLANDC__)
+# elif defined(__BORLANDC__) && !defined(__clang__)
 #  undef HAVE_HYPOT
 #  define HAVE_HYPOT 1
 # endif

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ inline typeinfo typeid_ref(type<T>*, ...)`
`47`	`47`	`return detail::typeid_ref_1((T(*)())0);`
`48`	`48`	`}`
`49`	`49`
`50`		`-#if defined(BOOST_MSVC) \|\| (defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32))`
	`50`	`+#if defined(BOOST_MSVC) \|\| (defined(BOOST_BORLANDC) && !defined(BOOST_DISABLE_WIN32))`
`51`	`51`	`# define BOOST_PYTT_DECL __cdecl`
`52`	`52`	`#else`
`53`	`53`	`# define BOOST_PYTT_DECL /**/`