diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-16 04:04:47 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-16 04:04:47 +0000 |
| commit | 1d7928becf0b9edaf51e76b70c2a1ca809e9c4bf (patch) | |
| tree | 2281bbd03e8cfbfaff9b72e14db372556f1a7016 | |
| parent | c378aa710a5da8b1fe138fa03fca415b5384d287 (diff) | |
| download | ATCD-1d7928becf0b9edaf51e76b70c2a1ca809e9c4bf.tar.gz | |
ChangeLogTag:Mon May 15 21:00:31 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/CDR_Stream.i | 8 |
4 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 1128575b44b..e97272fd69d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon May 15 21:00:31 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.i: + The swap_8 operator was not working when debugging was + disabled. + Mon May 15 16:06:01 2000 Priyanka Gontla <pgontla@ece.uci.edu> * ace/CORBA_macros.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 1128575b44b..e97272fd69d 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Mon May 15 21:00:31 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.i: + The swap_8 operator was not working when debugging was + disabled. + Mon May 15 16:06:01 2000 Priyanka Gontla <pgontla@ece.uci.edu> * ace/CORBA_macros.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1128575b44b..e97272fd69d 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Mon May 15 21:00:31 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/CDR_Stream.i: + The swap_8 operator was not working when debugging was + disabled. + Mon May 15 16:06:01 2000 Priyanka Gontla <pgontla@ece.uci.edu> * ace/CORBA_macros.h: diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index 3a87ec44907..b85c57e08d5 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -100,12 +100,12 @@ ACE_INLINE void ACE_CDR::swap_8 (const char* orig, char* target) { #if defined(ACE_HAS_PENTIUM) && defined(__GNUG__) + ACE_CDR::swap_4 (orig, target); + ACE_CDR::swap_4 (orig + 4, target + 4); register unsigned int i = - *ACE_reinterpret_cast(const unsigned int*, orig); + *ACE_reinterpret_cast(const unsigned int*, target); register unsigned int j = - *ACE_reinterpret_cast(const unsigned int*, (orig + 4)); - asm ("bswap %1" : "=r" (i) : "0r" (i)); - asm ("bswap %1" : "=r" (j) : "0r" (j)); + *ACE_reinterpret_cast(const unsigned int*, target + 4); *ACE_reinterpret_cast(unsigned int*, target + 4) = i; *ACE_reinterpret_cast(unsigned int*, target) = j; #elif defined(ACE_HAS_PENTIUM) \ |