feedc0de/boost_tuple
1
0
Fork 0
forked from boostorg/tuple
Code Pull Requests Activity

Merge pull request #15 from eldiener/develop

Browse Source 
Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74
This commit is contained in:
Joel de Guzman
2020-04-09 21:38:47 +08:00
committed by GitHub
parent 9fd6a5e2c6 c4addf9795
commit cf820922ac
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/tuple/detail/tuple_basic.hpp
View File

@ -141,7 +141,7 @@ private:
typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
apply<T>::type::head_type unqualified_type;
public:
#if BOOST_WORKAROUND(__BORLANDC__,<0x600)
#if BOOST_WORKAROUND(BOOST_BORLANDC,<0x600)
typedef const unqualified_type type;
#else
typedef BOOST_DEDUCED_TYPENAME boost::add_const<unqualified_type>::type type;

2
include/boost/tuple/tuple_io.hpp
View File

@ -259,7 +259,7 @@ extract_and_check_delimiter(
#if defined (BOOST_NO_STD_LOCALE)
const bool is_delimiter = !isspace(d);
#elif defined ( __BORLANDC__ )
#elif defined ( BOOST_BORLANDC )
const bool is_delimiter = !std::use_facet< std::ctype< CharType > >
(is.getloc() ).is( std::ctype_base::space, d);
#else

4
test/tuple_test_bench.cpp
View File

@ -81,7 +81,7 @@ typedef tuple<std::string, std::pair<A, B> > t4;
typedef tuple<A*, tuple<const A*, const B&, C>, bool, void*> t5;
typedef tuple<volatile int, const volatile char&, int(&)(float) > t6;
# if !defined(__BORLANDC__) || __BORLAND__ > 0x0551
# if !defined(BOOST_BORLANDC) || BOOST_BORLANDC > 0x0551
typedef tuple<B(A::*)(C&), A&> t7;
#endif
@ -306,7 +306,7 @@ make_tuple_test()
// With function pointers, make_tuple works just fine
#if !defined(__BORLANDC__) || __BORLAND__ > 0x0551
#if !defined(BOOST_BORLANDC) || BOOST_BORLANDC > 0x0551
make_tuple(&make_tuple_test);
#endif