boostorg/detail
1
0
Fork 1
mirror of https://github.com/boostorg/detail.git synced 2025-07-30 20:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 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:
Andrey Semashev
2020-05-06 20:29:53 +03:00
committed by GitHub
parent 52b610e32b f5bb480082
commit 925c8ba02e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/detail/catch_exceptions.hpp
View File

@ -18,6 +18,7 @@
// header dependencies are deliberately restricted to the standard library // header dependencies are deliberately restricted to the standard library
// to reduce coupling to other boost libraries. // to reduce coupling to other boost libraries.
#include <boost/config.hpp>
#include <string> // for string #include <string> // for string
#include <new> // for bad_alloc #include <new> // for bad_alloc
#include <typeinfo> // for bad_cast, bad_typeid #include <typeinfo> // for bad_cast, bad_typeid
@ -26,7 +27,7 @@
#include <boost/cstdlib.hpp> // for exit codes #include <boost/cstdlib.hpp> // for exit codes
#include <ostream> // for ostream #include <ostream> // for ostream
# if defined(__BORLANDC__) && (__BORLANDC__ <= 0x0551) # if defined(BOOST_BORLANDC) && (__BORLANDC__ <= 0x0551)
# define BOOST_BUILT_IN_EXCEPTIONS_MISSING_WHAT # define BOOST_BUILT_IN_EXCEPTIONS_MISSING_WHAT
# endif # endif

7
include/boost/detail/named_template_params.hpp
View File

@ -11,9 +11,10 @@
#ifndef BOOST_DETAIL_NAMED_TEMPLATE_PARAMS_HPP #ifndef BOOST_DETAIL_NAMED_TEMPLATE_PARAMS_HPP
#define BOOST_DETAIL_NAMED_TEMPLATE_PARAMS_HPP #define BOOST_DETAIL_NAMED_TEMPLATE_PARAMS_HPP
#include <boost/config.hpp>
#include <boost/type_traits/conversion_traits.hpp> #include <boost/type_traits/conversion_traits.hpp>
#include <boost/type_traits/composite_traits.hpp> // for is_reference #include <boost/type_traits/composite_traits.hpp> // for is_reference
#if defined(__BORLANDC__) #if defined(BOOST_BORLANDC)
#include <boost/type_traits/ice.hpp> #include <boost/type_traits/ice.hpp>
#endif #endif
@ -57,7 +58,7 @@ namespace boost {
}; };
}; };
#if defined(__BORLANDC__) #if defined(BOOST_BORLANDC)
template <class UseDefault> template <class UseDefault>
struct choose_arg_or_default { typedef choose_arg type; }; struct choose_arg_or_default { typedef choose_arg type; };
template <> template <>
@ -75,7 +76,7 @@ namespace boost {
template <class Arg, class DefaultGen, class Base, class Traits> template <class Arg, class DefaultGen, class Base, class Traits>
class resolve_default { class resolve_default {
#if defined(__BORLANDC__) #if defined(BOOST_BORLANDC)
typedef typename choose_arg_or_default<typename is_default<Arg>::type>::type Selector; typedef typename choose_arg_or_default<typename is_default<Arg>::type>::type Selector;
#else #else
// This usually works for Borland, but I'm seeing weird errors in // This usually works for Borland, but I'm seeing weird errors in