diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-31 08:37:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-31 08:37:32 +0000 |
| commit | f139b1ac1d1f03bcbe995f7480d704026429f584 (patch) | |
| tree | e88c983bb5de8f058a0f3112a80ec4634142faad /ace | |
| parent | b6fb88e0c43dd4aff19398bde92d2ccb3e6f5112 (diff) | |
| download | ATCD-f139b1ac1d1f03bcbe995f7480d704026429f584.tar.gz | |
ChangeLogTag: Thu Mar 30 19:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/config-win32-borland.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index 8a00efaea88..91b81ece8a1 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -103,6 +103,13 @@ #define ACE_HAS_NONCONST_TEMPNAM +// The Borland 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__) +# define ACE_LACKS_INLINE_ASSEMBLY +#endif + #if (__BORLANDC__ >= 0x600) # define ACE_LACKS_PTRDIFF_T # define ACE_PTRDIFF_T_TYPE std::ptrdiff_t |