From 116cc18560b8550034822f456fe7c4232d8025d0 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 23 Mar 2020 09:35:45 -0400 Subject: [PATCH] Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. --- include/boost/detail/catch_exceptions.hpp | 2 +- include/boost/detail/named_template_params.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/detail/catch_exceptions.hpp b/include/boost/detail/catch_exceptions.hpp index 823ebd1..f768557 100644 --- a/include/boost/detail/catch_exceptions.hpp +++ b/include/boost/detail/catch_exceptions.hpp @@ -26,7 +26,7 @@ #include // for exit codes #include // for ostream -# if defined(__BORLANDC__) && (__BORLANDC__ <= 0x0551) +# if defined(BOOST_BORLANDC) && (BOOST_BORLANDC <= 0x0551) # define BOOST_BUILT_IN_EXCEPTIONS_MISSING_WHAT # endif diff --git a/include/boost/detail/named_template_params.hpp b/include/boost/detail/named_template_params.hpp index e7cb079..c8ff904 100644 --- a/include/boost/detail/named_template_params.hpp +++ b/include/boost/detail/named_template_params.hpp @@ -13,7 +13,7 @@ #include #include // for is_reference -#if defined(__BORLANDC__) +#if defined(BOOST_BORLANDC) #include #endif @@ -57,7 +57,7 @@ namespace boost { }; }; -#if defined(__BORLANDC__) +#if defined(BOOST_BORLANDC) template struct choose_arg_or_default { typedef choose_arg type; }; template <> @@ -75,7 +75,7 @@ namespace boost { template class resolve_default { -#if defined(__BORLANDC__) +#if defined(BOOST_BORLANDC) typedef typename choose_arg_or_default::type>::type Selector; #else // This usually works for Borland, but I'm seeing weird errors in