2
0
mirror of https://github.com/boostorg/assign.git synced 2026-02-01 08:02:08 +00:00

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

This commit is contained in:
Edward Diener
2020-04-16 10:50:32 -04:00
committed by GitHub
parent d30e5c2d37
commit 722683bda9
15 changed files with 26 additions and 26 deletions

View File

@@ -10,7 +10,7 @@
#include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x564) )
#if BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x564) )
# pragma warn -8091 // suppress warning in Boost.Test
# pragma warn -8057 // unused argument argc/argv in Boost.Test
#endif
@@ -55,7 +55,7 @@ void check_array()
typedef boost::array<float,6> Array;
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
Array a = list_of(1)(2)(3)(4)(5)(6).to_array(a);
#else
Array a = list_of(1)(2)(3)(4)(5)(6);
@@ -64,14 +64,14 @@ void check_array()
BOOST_CHECK_EQUAL( a[0], 1 );
BOOST_CHECK_EQUAL( a[5], 6 );
// last element is implicitly 0
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
Array a2 = list_of(1)(2)(3)(4)(5).to_array(a2);
#else
Array a2 = list_of(1)(2)(3)(4)(5);
#endif
BOOST_CHECK_EQUAL( a2[5], 0 );
// two last elements are implicitly
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
a2 = list_of(1))(2)(3)(4).to_array(a2);
#else
a2 = list_of(1)(2)(3)(4);
@@ -79,7 +79,7 @@ void check_array()
BOOST_CHECK_EQUAL( a2[4], 0 );
BOOST_CHECK_EQUAL( a2[5], 0 );
// too many arguments
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
BOOST_CHECK_THROW( a2 = list_of(1)(2)(3)(4)(5)(6)(6).to_array(a2),
assignment_exception );