diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-04-10 09:53:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 09:53:57 +0200 |
| commit | 69d6f8ecbb8878a836f372e228b377ba04eaa3a9 (patch) | |
| tree | 02987350d2b03fb77e95cc367c0f2f4d57ad4f4b | |
| parent | 7053d9eede98769be570c1ac192298270f71eb11 (diff) | |
| parent | 3ead9df51912321ed0040cf193127eb254adbdf5 (diff) | |
| download | ATCD-69d6f8ecbb8878a836f372e228b377ba04eaa3a9.tar.gz | |
Merge pull request #612 from jwillemsen/master
Disable intel assembly when using the Embarcadero clang compilers
| -rw-r--r-- | ACE/ace/CDR_Base.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index d66a0625eba..56b65f08080 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -52,7 +52,7 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n) } #else char const * const o4 = ACE_ptr_align_binary (orig, 4); - // this is an _if_, not a _while_. The mistmatch can only be by 2. + // this is an _if_, not a _while_. The mismatch can only be by 2. if (orig != o4) { ACE_CDR::swap_2 (orig, target); @@ -74,7 +74,7 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n) // end marks our barrier for not falling outside. char const * const end = orig + 2 * (n & (~3)); - // See if we're aligned for writting in 64 or 32 bit chunks... + // See if we're aligned for writing in 64 or 32 bit chunks... #if ACE_SIZEOF_LONG == 8 && \ !((defined(__amd64__) || defined (__x86_64__)) && defined(__GNUG__)) if (target == ACE_ptr_align_binary (target, 8)) diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 6a1f3dee4ae..ceb7782156c 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -189,6 +189,7 @@ # define ACE_HAS_BUILTIN_BSWAP16 # define ACE_HAS_BUILTIN_BSWAP32 # define ACE_HAS_BUILTIN_BSWAP64 +# define ACE_LACKS_INLINE_ASSEMBLY #endif /* __clang__ */ |