From e77766b4a61f3f6a07af7a817f4143badcd51eda Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 30 Mar 2020 20:35:37 -0400 Subject: [PATCH] Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. --- example/bounded_buffer_comparison.cpp | 2 +- example/circular_buffer_bound_example.cpp | 2 +- include/boost/circular_buffer.hpp | 2 +- include/boost/circular_buffer/base.hpp | 12 ++++++------ include/boost/circular_buffer/space_optimized.hpp | 4 ++-- test/bounded_buffer_comparison.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/example/bounded_buffer_comparison.cpp b/example/bounded_buffer_comparison.cpp index 9eba9964..69ab224e 100644 --- a/example/bounded_buffer_comparison.cpp +++ b/example/bounded_buffer_comparison.cpp @@ -233,7 +233,7 @@ void fifo_test(Buffer* buffer) { // Initialize the buffer with some values before launching producer and consumer threads. for (unsigned long i = QUEUE_SIZE / 2L; i > 0; --i) { -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) buffer->push_front(Buffer::value_type()); #else buffer->push_front(BOOST_DEDUCED_TYPENAME Buffer::value_type()); diff --git a/example/circular_buffer_bound_example.cpp b/example/circular_buffer_bound_example.cpp index b5b7c12f..67316651 100644 --- a/example/circular_buffer_bound_example.cpp +++ b/example/circular_buffer_bound_example.cpp @@ -136,7 +136,7 @@ void fifo_test(Buffer* buffer) // Initialize the buffer with some values before launching producer and consumer threads. for (unsigned long i = queue_size / 2L; i > 0; --i) { -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) buffer->push_front(Buffer::value_type()); #else buffer->push_front(BOOST_DEDUCED_TYPENAME Buffer::value_type()); diff --git a/include/boost/circular_buffer.hpp b/include/boost/circular_buffer.hpp index 90d920ba..aa8a2e5b 100644 --- a/include/boost/circular_buffer.hpp +++ b/include/boost/circular_buffer.hpp @@ -37,7 +37,7 @@ Includes #endif /*! INTERNAL ONLY */ -#if BOOST_WORKAROUND(__BORLANDC__, <= 0x0550) || BOOST_WORKAROUND(__MWERKS__, <= 0x2407) +#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x0550) || BOOST_WORKAROUND(__MWERKS__, <= 0x2407) #define BOOST_CB_IS_CONVERTIBLE(Iterator, Type) ((void)0) #else #include diff --git a/include/boost/circular_buffer/base.hpp b/include/boost/circular_buffer/base.hpp index edc132ac..c595253d 100644 --- a/include/boost/circular_buffer/base.hpp +++ b/include/boost/circular_buffer/base.hpp @@ -2519,7 +2519,7 @@ private empty_value template void initialize(Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) initialize(first, last, std::iterator_traits::iterator_category()); #else initialize(first, last, BOOST_DEDUCED_TYPENAME std::iterator_traits::iterator_category()); @@ -2558,7 +2558,7 @@ private empty_value template void initialize(capacity_type buffer_capacity, Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) initialize(buffer_capacity, first, last, std::iterator_traits::iterator_category()); #else initialize(buffer_capacity, first, last, BOOST_DEDUCED_TYPENAME std::iterator_traits::iterator_category()); @@ -2652,7 +2652,7 @@ private empty_value template void assign(Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) assign(first, last, std::iterator_traits::iterator_category()); #else assign(first, last, BOOST_DEDUCED_TYPENAME std::iterator_traits::iterator_category()); @@ -2689,7 +2689,7 @@ private empty_value template void assign(capacity_type new_capacity, Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) assign(new_capacity, first, last, std::iterator_traits::iterator_category()); #else assign(new_capacity, first, last, BOOST_DEDUCED_TYPENAME std::iterator_traits::iterator_category()); @@ -2798,7 +2798,7 @@ private empty_value template void insert(const iterator& pos, Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) insert(pos, first, last, std::iterator_traits::iterator_category()); #else insert(pos, first, last, BOOST_DEDUCED_TYPENAME std::iterator_traits::iterator_category()); @@ -2889,7 +2889,7 @@ private empty_value template void rinsert(const iterator& pos, Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) rinsert(pos, first, last, std::iterator_traits::iterator_category()); #else rinsert(pos, first, last, BOOST_DEDUCED_TYPENAME std::iterator_traits::iterator_category()); diff --git a/include/boost/circular_buffer/space_optimized.hpp b/include/boost/circular_buffer/space_optimized.hpp index 34dbd9b9..21681fd3 100644 --- a/include/boost/circular_buffer/space_optimized.hpp +++ b/include/boost/circular_buffer/space_optimized.hpp @@ -121,7 +121,7 @@ public:
using circular_buffer::max_size; using circular_buffer::empty; -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) reference operator [] (size_type n) { return circular_buffer::operator[](n); } const_reference operator [] (size_type n) const { return circular_buffer::operator[](n); } #else @@ -1598,7 +1598,7 @@ public:
static size_type init_capacity(const capacity_type& capacity_ctrl, Iterator first, Iterator last, const false_type&) { BOOST_CB_IS_CONVERTIBLE(Iterator, value_type); // check for invalid iterator type -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) return init_capacity(capacity_ctrl, first, last, std::iterator_traits::iterator_category()); #else return init_capacity( diff --git a/test/bounded_buffer_comparison.cpp b/test/bounded_buffer_comparison.cpp index c2bec05d..23b718b9 100644 --- a/test/bounded_buffer_comparison.cpp +++ b/test/bounded_buffer_comparison.cpp @@ -233,7 +233,7 @@ void fifo_test(Buffer* buffer) { // Initialize the buffer with some values before launching producer and consumer threads. for (unsigned long i = QUEUE_SIZE / 2L; i > 0; --i) { -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) buffer->push_front(Buffer::value_type()); #else buffer->push_front(BOOST_DEDUCED_TYPENAME Buffer::value_type());