diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-03-06 13:20:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 13:20:29 +0100 |
| commit | 7e0425400e16b4a7afc9b3c03d1176e6dcdb8373 (patch) | |
| tree | 391b707284e50b9fab013a60f3b0d838eebacedc | |
| parent | 132c6df724b3f4d82ade1b6a73fd86d4c240bb20 (diff) | |
| parent | 4fa7cca17c3ff0c07f4c1b7b1bda71b6e131092b (diff) | |
| download | ATCD-7e0425400e16b4a7afc9b3c03d1176e6dcdb8373.tar.gz | |
Merge pull request #586 from jwillemsen/jwi-bcc32inline
Any bcc32 version doesn't support inlined assembly
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 0f6faa8e1b3..25333940e55 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -174,6 +174,12 @@ #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 |