boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 02:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63 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:
Marshall Clow 2020-04-12 09:49:06 -07:00 committed by GitHub
commit 0c059a50ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/detail/call_traits.hpp
View File

@ -100,7 +100,7 @@ struct call_traits<T&>
typedef T& param_type; // hh removed const typedef T& param_type; // hh removed const
}; };
#if BOOST_WORKAROUND( __BORLANDC__, < 0x5A0 ) #if BOOST_WORKAROUND( BOOST_BORLANDC, < 0x5A0 )
// these are illegal specialisations; cv-qualifies applied to // these are illegal specialisations; cv-qualifies applied to
// references have no effect according to [8.3.2p1], // references have no effect according to [8.3.2p1],
// C++ Builder requires them though as it treats cv-qualified // C++ Builder requires them though as it treats cv-qualified

6
include/boost/utility/detail/result_of_iterate.hpp
View File

@ -22,7 +22,7 @@
# define BOOST_RESULT_OF_ARGS BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T) # define BOOST_RESULT_OF_ARGS BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)
#endif #endif
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)> template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)>
struct tr1_result_of<F(BOOST_RESULT_OF_ARGS)> struct tr1_result_of<F(BOOST_RESULT_OF_ARGS)>
: conditional< : conditional<
@ -151,7 +151,7 @@ struct cpp0x_result_of_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)),
#else // defined(BOOST_RESULT_OF_USE_DECLTYPE) || defined(BOOST_RESULT_OF_USE_TR1_WITH_DECLTYPE_FALLBACK) #else // defined(BOOST_RESULT_OF_USE_DECLTYPE) || defined(BOOST_RESULT_OF_USE_TR1_WITH_DECLTYPE_FALLBACK)
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)> template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)>
struct result_of<F(BOOST_RESULT_OF_ARGS)> struct result_of<F(BOOST_RESULT_OF_ARGS)>
: tr1_result_of<F(BOOST_RESULT_OF_ARGS)> { }; : tr1_result_of<F(BOOST_RESULT_OF_ARGS)> { };
@ -177,7 +177,7 @@ struct tr1_result_of_impl<R (&)(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)), F
typedef R type; typedef R type;
}; };
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
template<typename R, typename FArgs BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)> template<typename R, typename FArgs BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)>
struct tr1_result_of_impl<R (T0::*) struct tr1_result_of_impl<R (T0::*)
(BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T)), (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T)),

4
include/boost/utility/value_init.hpp
View File

@ -66,7 +66,7 @@ class initialized
private : private :
struct wrapper struct wrapper
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x592))
typename typename
#endif #endif
remove_const<T>::type data; remove_const<T>::type data;
@ -87,7 +87,7 @@ class initialized
}; };
mutable mutable
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592)) #if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x592))
typename typename
#endif #endif
aligned_storage<sizeof(wrapper), alignment_of<wrapper>::value>::type x; aligned_storage<sizeof(wrapper), alignment_of<wrapper>::value>::type x;

4
test/call_traits_test.cpp
View File

@ -376,7 +376,7 @@ void call_traits_test<T, true>::assert_construct(typename boost::call_traits<T>:
reference r = t; reference r = t;
const_reference cr = t; const_reference cr = t;
reference r2 = r; reference r2 = r;
#ifndef __BORLANDC__ #ifndef BOOST_BORLANDC
// C++ Builder buglet: // C++ Builder buglet:
const_reference cr2 = r; const_reference cr2 = r;
#endif #endif
@ -393,7 +393,7 @@ void call_traits_test<T, true>::assert_construct(typename boost::call_traits<T>:
unused_variable(v3); unused_variable(v3);
unused_variable(v4); unused_variable(v4);
unused_variable(v5); unused_variable(v5);
#ifndef __BORLANDC__ #ifndef BOOST_BORLANDC
unused_variable(r2); unused_variable(r2);
unused_variable(cr2); unused_variable(cr2);
#endif #endif

6
test/value_init_test.cpp
View File

@ -17,7 +17,7 @@
#include "boost/utility/value_init.hpp" #include "boost/utility/value_init.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif
@ -217,8 +217,8 @@ void check_initialized_value ( T const& y )
BOOST_TEST ( y == initializedValue ) ; BOOST_TEST ( y == initializedValue ) ;
} }
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#if __BORLANDC__ == 0x582 #if BOOST_BORLANDC == 0x582
void check_initialized_value( NonPOD const& ) void check_initialized_value( NonPOD const& )
{ {
// The initialized_value check is skipped for Borland 5.82 // The initialized_value check is skipped for Borland 5.82

2
test/value_init_test_fail1.cpp
View File

@ -13,7 +13,7 @@
#include "boost/utility/value_init.hpp" #include "boost/utility/value_init.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

2
test/value_init_test_fail2.cpp
View File

@ -13,7 +13,7 @@
#include "boost/utility/value_init.hpp" #include "boost/utility/value_init.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif

2
test/value_init_test_fail3.cpp
View File

@ -13,7 +13,7 @@
#include "boost/utility/value_init.hpp" #include "boost/utility/value_init.hpp"
#ifdef __BORLANDC__ #ifdef BOOST_BORLANDC
#pragma hdrstop #pragma hdrstop
#endif #endif