From 1818113f4c16d511d0fc7ecb044598c37e78dfd3 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 23 Mar 2020 11:50:36 -0400 Subject: [PATCH] Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. --- include/boost/container_hash/hash.hpp | 2 +- include/boost/container_hash/hash_fwd.hpp | 2 +- test/hash_float_test.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/container_hash/hash.hpp b/include/boost/container_hash/hash.hpp index 7aac2fa..6059fee 100644 --- a/include/boost/container_hash/hash.hpp +++ b/include/boost/container_hash/hash.hpp @@ -442,7 +442,7 @@ namespace boost } } -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551)) template inline std::size_t hash_range(T* first, T* last) { diff --git a/include/boost/container_hash/hash_fwd.hpp b/include/boost/container_hash/hash_fwd.hpp index a87c182..46340b3 100644 --- a/include/boost/container_hash/hash_fwd.hpp +++ b/include/boost/container_hash/hash_fwd.hpp @@ -27,7 +27,7 @@ namespace boost template std::size_t hash_range(It, It); template void hash_range(std::size_t&, It, It); -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551)) template inline std::size_t hash_range(T*, T*); template inline void hash_range(std::size_t&, T*, T*); #endif diff --git a/test/hash_float_test.hpp b/test/hash_float_test.hpp index ab79a12..fd31687 100644 --- a/test/hash_float_test.hpp +++ b/test/hash_float_test.hpp @@ -91,7 +91,7 @@ void float_tests(char const* name, T* = 0) using namespace std; // Doing anything with infinity causes borland to crash. -#if defined(__BORLANDC__) +#if defined(BOOST_BORLANDC) std::cerr << "Not running infinity checks on Borland, as it causes it to crash." "\n"; @@ -292,7 +292,7 @@ void float_tests(char const* name, T* = 0) } // NaN also causes borland to crash. -#if !defined(__BORLANDC__) && defined(BOOST_HASH_TEST_EXTENSIONS) +#if !defined(BOOST_BORLANDC) && defined(BOOST_HASH_TEST_EXTENSIONS) if(boost::hash_detail::limits::has_quiet_NaN) { if(x1(boost::hash_detail::limits::quiet_NaN()) == x1(1.0)) { std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<