diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-02 13:14:40 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-02 13:14:40 +0000 |
| commit | 6c6797d98f60fd0a44535aa934d5e9f6bbf351f5 (patch) | |
| tree | 2a9e5d7b23531a57fedf53cf795539abca7a4321 | |
| parent | 88687366aca3bf573ef09d07bc09835458ece0d1 (diff) | |
| download | ATCD-6c6797d98f60fd0a44535aa934d5e9f6bbf351f5.tar.gz | |
Had to make the alignment changes specific only to Borland.
| -rw-r--r-- | TAO/tao/decode.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/deep_free.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/encode.cpp | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 1ff0746023a..25ecce0f33c 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -600,10 +600,8 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr tc, alignment = param->alignment (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // MSVC built code works with either of these, but Borland - // Builder needs the first one, whereas Sun compilers - // need the second one. -#if defined (WIN32) + // Borland Builder aligns things a little differently. +#if defined (__BORLANDC__) align_offset = (ptr_arith_t) ptr_align_binary (data, alignment) - (ptr_arith_t) data diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index fcf04851858..26a74d48c1d 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -211,10 +211,8 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, alignment = param->alignment (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // MSVC built code works with either of these, but Borland - // Builder needs the first one, whereas Sun compilers - // need the second one. -#if defined (WIN32) + // Borland Builder aligns things a little differently. +#if defined (__BORLANDC__) align_offset = (ptr_arith_t) ptr_align_binary (source, alignment) - (ptr_arith_t) source diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index a1f825e3a37..cc826240eb4 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -316,10 +316,8 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, alignment = param->alignment (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // MSVC built code works with either of these, but Borland - // Builder needs the first one, whereas Sun compilers - // need the second one. -#if defined (WIN32) + // Borland Builder aligns things a little differently. +#if defined (__BORLANDC__) align_offset = (ptr_arith_t) ptr_align_binary (data, alignment) - (ptr_arith_t) data |