feedc0de/boost_bind
1
0
Fork 0
forked from boostorg/bind
Code Pull Requests Activity

Merge pull request #19 from eldiener/develop

Browse Source 
Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74. Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost conf…
This commit is contained in:
Peter Dimov
2020-05-06 16:36:47 +03:00
committed by GitHub
parent e3cf787dff 3bdf307707
commit 40f38c9fb5
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/bind/bind.hpp
View File

@@ -38,7 +38,7 @@
// Borland-specific bug, visit_each() silently fails to produce code // Borland-specific bug, visit_each() silently fails to produce code
#if defined(__BORLANDC__) #if defined(BOOST_BORLANDC)
# define BOOST_BIND_VISIT_EACH boost::visit_each # define BOOST_BIND_VISIT_EACH boost::visit_each
#else #else
# define BOOST_BIND_VISIT_EACH visit_each # define BOOST_BIND_VISIT_EACH visit_each
@@ -1422,7 +1422,7 @@ public:
template<class V> void accept( V & v ) const template<class V> void accept( V & v ) const
{ {
#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( __BORLANDC__ ) #if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( BOOST_BORLANDC )
using boost::visit_each; using boost::visit_each;
#endif #endif
@@ -1559,7 +1559,7 @@ namespace _bi
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || (__SUNPRO_CC >= 0x530) #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || (__SUNPRO_CC >= 0x530)
#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x582) ) #if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x582) )
template<class T> struct add_value template<class T> struct add_value
{ {
@@ -1811,7 +1811,7 @@ BOOST_BIND_OPERATOR( >=, greater_equal )
// visit_each, ADL // visit_each, ADL
#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( __BORLANDC__ ) \ #if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( BOOST_BORLANDC ) \
&& !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) && !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
template<class V, class T> void visit_each( V & v, value<T> const & t, int ) template<class V, class T> void visit_each( V & v, value<T> const & t, int )
@@ -1831,7 +1831,7 @@ template<class V, class R, class F, class L> void visit_each( V & v, bind_t<R, F
// visit_each, no ADL // visit_each, no ADL
#if defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) || defined( __BORLANDC__ ) \ #if defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) || defined( BOOST_BORLANDC ) \
|| (defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) || (defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
template<class V, class T> void visit_each( V & v, _bi::value<T> const & t, int ) template<class V, class T> void visit_each( V & v, _bi::value<T> const & t, int )
@@ -2245,7 +2245,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
// data member pointers // data member pointers
#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \ #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
|| ( defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x620 ) ) ) || ( defined(BOOST_BORLANDC) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) ) )
template<class R, class T, class A1> template<class R, class T, class A1>
_bi::bind_t< R, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type > _bi::bind_t< R, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >

2
include/boost/bind/bind_template.hpp
View File

@@ -325,7 +325,7 @@
template<class V> void accept(V & v) const template<class V> void accept(V & v) const
{ {
#if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( __BORLANDC__ ) #if !defined( BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP ) && !defined( BOOST_BORLANDC )
using boost::visit_each; using boost::visit_each;

2
include/boost/bind/placeholders.hpp
View File

@@ -29,7 +29,7 @@ namespace boost
namespace placeholders namespace placeholders
{ {
#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ < 4) #if defined(BOOST_BORLANDC) || defined(__GNUC__) && (__GNUC__ < 4)
inline boost::arg<1> _1() { return boost::arg<1>(); } inline boost::arg<1> _1() { return boost::arg<1>(); }
inline boost::arg<2> _2() { return boost::arg<2>(); } inline boost::arg<2> _2() { return boost::arg<2>(); }

2
include/boost/bind/storage.hpp
View File

@@ -49,7 +49,7 @@ template<class A1> struct storage1
A1 a1_; A1 a1_;
}; };
#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( __BORLANDC__ ) #if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_BORLANDC )
template<int I> struct storage1< boost::arg<I> > template<int I> struct storage1< boost::arg<I> >
{ {

4
test/mem_fn_unary_addr_test.cpp
View File

@@ -83,7 +83,7 @@ public:
} }
}; };
#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x620 ) ) #if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) )
namespace boost namespace boost
{ {
#endif #endif
@@ -93,7 +93,7 @@ template<class T> T * get_pointer( Y< T > const & y )
return y.get(); return y.get();
} }
#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x620 ) ) #if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x620 ) )
} // namespace boost } // namespace boost
#endif #endif