diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-09-06 18:29:22 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-09-06 18:29:22 +0000 |
| commit | 6dc25fcc7efff1c8d50ad07f878aec50cec3bd57 (patch) | |
| tree | 1aabc728202b53bc78b09e9c2b49c17fe16b0e64 | |
| parent | 98bab6b2056f9b3574f2a70a20c2cb9d0f8bebe3 (diff) | |
| download | ATCD-6dc25fcc7efff1c8d50ad07f878aec50cec3bd57.tar.gz | |
Thu Sep 6 18:28:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 59cad4cbd8e..49701775927 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 6 18:28:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-borland.h: + Make use of the new inline assembly feature of the upcoming CodeGear C++ + compiler + Thu Sep 6 18:53:06 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * tests/run_test.lst: diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 2646135e8a8..fd0970e416f 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -103,11 +103,13 @@ #define ACE_HAS_NONCONST_TEMPNAM -// The Borland compiler can't handle assembly in inline methods or +#if (__BORLANDC__ < 0x592) +// Older Borland compilers 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 +# if defined (ACE_HAS_PENTIUM) && defined(__ACE_INLINE__) +# define ACE_LACKS_INLINE_ASSEMBLY +# endif #endif #define ACE_WCSDUP_EQUIVALENT ::_wcsdup |