diff options
Diffstat (limited to '3rdParty/Boost/src/boost/config/compiler/borland.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/config/compiler/borland.hpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/config/compiler/borland.hpp b/3rdParty/Boost/src/boost/config/compiler/borland.hpp index a989fd6..60f5505 100644 --- a/3rdParty/Boost/src/boost/config/compiler/borland.hpp +++ b/3rdParty/Boost/src/boost/config/compiler/borland.hpp @@ -56,8 +56,13 @@ # define BOOST_NO_CV_VOID_SPECIALIZATIONS # define BOOST_NO_DEDUCED_TYPENAME // workaround for missing WCHAR_MAX/WCHAR_MIN: +#ifdef __cplusplus #include <climits> #include <cwchar> +#else +#include <limits.h> +#include <wchar.h> +#endif // __cplusplus #ifndef WCHAR_MAX # define WCHAR_MAX 0xffff #endif @@ -69,7 +74,7 @@ // Borland C++ Builder 6 and below: #if (__BORLANDC__ <= 0x564) -# ifdef NDEBUG +# if defined(NDEBUG) && defined(__cplusplus) // fix broken <cstring> so that Boost.test works: # include <cstring> # undef strcmp @@ -166,7 +171,6 @@ #define BOOST_NO_AUTO_DECLARATIONS #define BOOST_NO_AUTO_MULTIDECLARATIONS -#define BOOST_NO_CONCEPTS #define BOOST_NO_CONSTEXPR #define BOOST_NO_DEFAULTED_FUNCTIONS #define BOOST_NO_DELETED_FUNCTIONS @@ -181,6 +185,8 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS // UTF-8 still not supported #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_NOEXCEPT +#define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX #if __BORLANDC__ >= 0x590 # define BOOST_HAS_TR1_HASH @@ -275,3 +281,4 @@ + |