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

Author: eldiener

example/snippets/regex_grep_example_4.cpp

@@ -17,7 +17,7 @@
   *                using a C++ Builder closure as a callback.
   */
 
-#ifdef __BORLANDC__
+#ifdef __BORLANDC__ && !defined(__clang__)
 
 #include <boost/regex.hpp>
 #include <string>
@@ -140,7 +140,7 @@ int main(int argc, const char** argv)
    return 0;
 }
 
-#else  // __BORLANDC__
+#else  // __BORLANDC__ && !defined(__clang__)
 
 int main()
 {

example/snippets/regex_match_example.cpp

@@ -49,7 +49,7 @@ int process_ftp(const char* response, std::string* msg)
    return -1;
 }
 
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550))
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550))
 //
 // problem with std::getline under MSVC6sp3
 istream& getline(istream& is, std::string& s)

example/snippets/regex_split_example_1.cpp

@@ -30,7 +30,7 @@ unsigned tokenise(std::list<std::string>& l, std::string& s)
 using namespace std;
 
 
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550))
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550))
 //
 // problem with std::getline under MSVC6sp3
 istream& getline(istream& is, std::string& s)

example/snippets/regex_token_iterator_eg_1.cpp

@@ -23,7 +23,7 @@
 using namespace std;
 
 
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550))
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550))
 //
 // problem with std::getline under MSVC6sp3
 istream& getline(istream& is, std::string& s)

example/timer/regex_timer.cpp

@@ -89,7 +89,7 @@ class string_out_iterator
 };
 
 namespace boost{
-#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ == 0x550)) || defined(__SGI_STL_PORT)
+#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && (BOOST_BORLANDC == 0x550)) || defined(__SGI_STL_PORT)
 //
 // problem with std::getline under MSVC6sp3
 // and C++ Builder 5.5, is this really that hard?

include/boost/regex/config.hpp

@@ -22,7 +22,7 @@
  * Borland C++ Fix/error check
  * this has to go *before* we include any std lib headers:
  */
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(__clang__)
 #  include <boost/regex/config/borland.hpp>
 #endif
 #include <boost/version.hpp>
@@ -278,7 +278,7 @@
 #  define BOOST_REGEX_CCALL __cdecl
 #endif
 
-#if defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)
+#if defined(__BORLANDC__) && !defined(__clang__) && !defined(BOOST_DISABLE_WIN32)
 #  define BOOST_REGEX_CALL __fastcall
 #  define BOOST_REGEX_CCALL __stdcall
 #endif
@@ -378,7 +378,7 @@ if(0 == (x))\
 
 #if !defined(BOOST_REGEX_NO_W32) && !defined(BOOST_REGEX_V3)
 #  if(defined(_WIN32) || defined(_WIN64) || defined(_WINCE)) \
-        && !defined(__GNUC__) \
+        && !(defined(__GNUC__) || defined(__BORLANDC__) && defined(__clang__)) \
         && !(defined(__BORLANDC__) && (__BORLANDC__ >= 0x600)) \
         && !(defined(__MWERKS__) && (__MWERKS__ <= 0x3003))
 #     define BOOST_REGEX_HAS_MS_STACK_GUARD

include/boost/regex/config/borland.hpp

@@ -17,7 +17,7 @@
   */
 
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(__clang__)
 #  if (__BORLANDC__ == 0x550) || (__BORLANDC__ == 0x551)
       // problems with std::basic_string and dll RTL:
 #     if defined(_RTLDLL) && defined(_RWSTD_COMPILE_INSTANTIATE)

include/boost/regex/v4/cpp_regex_traits.hpp

@@ -616,7 +616,7 @@ typename cpp_regex_traits_implementation<charT>::string_type
       // std::collate<wchar_t>::transform returns a different string!
       // So as a workaround, we'll truncate the string at the first NULL
       // which _seems_ to work....
-#if BOOST_WORKAROUND(__BORLANDC__, < 0x580)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x580)
       result.erase(result.find(charT(0)));
 #else
       //
@@ -669,7 +669,7 @@ typename cpp_regex_traits_implementation<charT>::string_type
          return pos->second;
    }
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
-               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+               && !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x0551)
    std::string name(p1, p2);
 #else
    std::string name;
@@ -679,7 +679,7 @@ typename cpp_regex_traits_implementation<charT>::string_type
 #endif
    name = lookup_default_collate_name(name);
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
-               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+               && !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x0551)
    if(name.size())
       return string_type(name.begin(), name.end());
 #else

include/boost/regex/v4/cregex.hpp

@@ -231,7 +231,7 @@ struct pred4;
 
 }  /* namespace BOOST_REGEX_DETAIL_NS */
 
-#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_DISABLE_WIN32)
+#if (defined(BOOST_MSVC) || defined(BOOST_BORLANDC)) && !defined(BOOST_DISABLE_WIN32)
 typedef bool (__cdecl *GrepCallback)(const RegEx& expression);
 typedef bool (__cdecl *GrepFileCallback)(const char* file, const RegEx& expression);
 typedef bool (__cdecl *FindFilesCallback)(const char* file);

include/boost/regex/v4/instances.hpp

@@ -41,7 +41,7 @@ namespace boost{
 // what follows is compiler specific:
 //
 
-#if  defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
+#if  defined(BOOST_BORLANDC) && (BOOST_BORLANDC < 0x600)
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX