diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-13 12:45:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 12:45:32 +0200 |
| commit | 121ce4ec0a3ece51991220bc98ce008e97614e2b (patch) | |
| tree | 458c785ba81d268068da5d5caca534d91ff871ab /ACE | |
| parent | a1d27bfcc0beed636df113e14610881b82937bc4 (diff) | |
| parent | a0da9d2ed9cc30217ba98f5c9de03ca2db8d3aa0 (diff) | |
| download | ATCD-121ce4ec0a3ece51991220bc98ce008e97614e2b.tar.gz | |
Merge pull request #1603 from jwillemsen/jwi-bcc32c
Only the Embarcadero clang based compilers support C++11
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index c15a8669558..e23007815ce 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -160,36 +160,28 @@ #endif #if defined (ACE_HAS_BCC32) -// The bcc32 compiler can't handle assembly in inline methods or -// templates (E2211). When we build for pentium optimized and we are inlining -// then we disable inline assembly -# if defined (ACE_HAS_PENTIUM) && defined(__ACE_INLINE__) && !defined(__clang__) -# define ACE_LACKS_INLINE_ASSEMBLY -# endif # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_NEEDS_DL_UNDERSCORE #endif -#ifdef __clang__ -# define ACE_ANY_OPS_USE_NAMESPACE -# define ACE_HAS_BUILTIN_BSWAP16 -# define ACE_HAS_BUILTIN_BSWAP32 -# define ACE_HAS_BUILTIN_BSWAP64 -# define ACE_LACKS_INLINE_ASSEMBLY +#define ACE_ANY_OPS_USE_NAMESPACE +#define ACE_HAS_BUILTIN_BSWAP16 +#define ACE_HAS_BUILTIN_BSWAP32 +#define ACE_HAS_BUILTIN_BSWAP64 +#define ACE_LACKS_INLINE_ASSEMBLY -# if __cplusplus >= 201103L -# define ACE_HAS_CPP11 -# endif -# if __cplusplus >= 201402L -# define ACE_HAS_CPP14 -# endif -# if __cplusplus >= 201703L -# define ACE_HAS_CPP17 -# endif -# if __cplusplus >= 202002L -# define ACE_HAS_CPP20 -# endif -#endif /* __clang__ */ +#if __cplusplus >= 201103L +# define ACE_HAS_CPP11 +#endif +#if __cplusplus >= 201402L +# define ACE_HAS_CPP14 +#endif +#if __cplusplus >= 201703L +# define ACE_HAS_CPP17 +#endif +#if __cplusplus >= 202002L +# define ACE_HAS_CPP20 +#endif #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_BORLAND_H */ |