feedc0de/boost_concept_check
1
0
Fork 0
forked from boostorg/concept_check
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Edward Diener
2020-04-16 10:52:36 -04:00
committed by GitHub
parent db1f9c73a4
commit e69c81326d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/concept/assert.hpp
View File

@@ -29,7 +29,7 @@
# ifdef BOOST_MSVC # ifdef BOOST_MSVC
# include <boost/concept/detail/msvc.hpp> # include <boost/concept/detail/msvc.hpp>
# elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) # elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
# include <boost/concept/detail/borland.hpp> # include <boost/concept/detail/borland.hpp>
# else # else
# include <boost/concept/detail/general.hpp> # include <boost/concept/detail/general.hpp>

2
include/boost/concept/requires.hpp
View File

@@ -65,7 +65,7 @@ struct Requires_ : ::boost::ccheck_aux::unaryfunptr_arg_type<Result>
# define BOOST_CONCEPT_REQUIRES(models, result) \ # define BOOST_CONCEPT_REQUIRES(models, result) \
typename ::boost::ccheck_aux::unaryfunptr_arg_type<void(*)result>::type typename ::boost::ccheck_aux::unaryfunptr_arg_type<void(*)result>::type
#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
// Same thing as below without the initial typename // Same thing as below without the initial typename
# define BOOST_CONCEPT_REQUIRES(models, result) \ # define BOOST_CONCEPT_REQUIRES(models, result) \

2
include/boost/concept_archetype.hpp
View File

@@ -57,7 +57,7 @@ namespace boost {
public: public:
static T& get() static T& get()
{ {
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
return *reinterpret_cast<T*>(0); return *reinterpret_cast<T*>(0);
#else #else
static char d[sizeof(T)]; static char d[sizeof(T)];

4
test/stl_concept_covering.cpp
View File

@@ -379,7 +379,7 @@ main()
convertible_to_archetype<FT> value(dummy_cons); convertible_to_archetype<FT> value(dummy_cons);
std::replace_if(fi, fi, pred, value); std::replace_if(fi, fi, pred, value);
} }
#if !defined(BOOST_MSVC) || BOOST_WORKAROUND(BOOST_MSVC, > 1900) #if (!defined(BOOST_MSVC) || BOOST_WORKAROUND(BOOST_MSVC, > 1900)) && !defined(BOOST_EMBTC)
// fails on MSVC 2015 and earlier // fails on MSVC 2015 and earlier
{ {
// Issue, the use of ?: inside replace_copy() complicates things // Issue, the use of ?: inside replace_copy() complicates things
@@ -548,7 +548,7 @@ main()
unary_predicate_archetype<PredArg> pred(dummy_cons); unary_predicate_archetype<PredArg> pred(dummy_cons);
bi = std::partition(bi, bi, pred); bi = std::partition(bi, bi, pred);
} }
#ifndef BOOST_MSVC #if !defined(BOOST_MSVC) && !defined(BOOST_EMBTC)
{ {
// fails on MSVC // fails on MSVC
typedef null_archetype<> PredArg; typedef null_archetype<> PredArg;