diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 21:00:24 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 21:00:24 +0000 |
| commit | 11d4562f69d29ecbabb1ff6676564b9181d48ba1 (patch) | |
| tree | c98c775b1a8210c39fe1880a82d44d7941b0be74 | |
| parent | b94e4f2b883fa7cb11e7a53d8f08f1d9dafe996a (diff) | |
| download | ATCD-11d4562f69d29ecbabb1ff6676564b9181d48ba1.tar.gz | |
ChangeLogTag:Thu May 18 15:59:10 2000 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | tests/CDR_File_Test.cpp | 24 |
4 files changed, 33 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index f5c7688d4a0..5320613b5d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +Thu May 18 15:59:10 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tests/CDR_File_Test.cpp: + Fixed so it works on platforms that lack native 64 bit types. + Thu May 18 13:56:49 2000 Jeff Parsons <parsons@cs.wustl.edu> - * ace/Configuration.cpp: - Removed an unused variable from import_config(). + * ace/Configuration.cpp: + Removed an unused variable from import_config(). Thu May 18 13:28:41 2000 Carlos O'Ryan <coryan@cs.wustl.edu> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f5c7688d4a0..5320613b5d5 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,7 +1,12 @@ +Thu May 18 15:59:10 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tests/CDR_File_Test.cpp: + Fixed so it works on platforms that lack native 64 bit types. + Thu May 18 13:56:49 2000 Jeff Parsons <parsons@cs.wustl.edu> - * ace/Configuration.cpp: - Removed an unused variable from import_config(). + * ace/Configuration.cpp: + Removed an unused variable from import_config(). Thu May 18 13:28:41 2000 Carlos O'Ryan <coryan@cs.wustl.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f5c7688d4a0..5320613b5d5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,7 +1,12 @@ +Thu May 18 15:59:10 2000 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tests/CDR_File_Test.cpp: + Fixed so it works on platforms that lack native 64 bit types. + Thu May 18 13:56:49 2000 Jeff Parsons <parsons@cs.wustl.edu> - * ace/Configuration.cpp: - Removed an unused variable from import_config(). + * ace/Configuration.cpp: + Removed an unused variable from import_config(). Thu May 18 13:28:41 2000 Carlos O'Ryan <coryan@cs.wustl.edu> diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index c24bba38c7b..010ae8683c6 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -72,19 +72,19 @@ operator << (ostream &os, { os << "Char: " << t.char_ << endl << "Short: " << t.word2_ << endl - << "Long: " << t.word4_ << endl -#if !defined(_MSC_VER) - << "ULongLong: " << t.word8_ << endl -#else - << "ULongLong 1st half: " - << hex - << ACE_reinterpret_cast(ACE_UINT32, (t.word8_ >> 32)) - << dec << endl + << "Long: " << t.word4_ << endl; + + ACE_CDR::ULongLong hi = (t.word8_ >> 32); + ACE_CDR::ULongLong lo = (t.word8_ & 0xffffffff); + + os << "ULongLong 1st half: " + << hex + << ACE_U64_TO_U32(hi) + << dec << endl << "ULongLong 2nd half: " - << hex - << ACE_reinterpret_cast(ACE_UINT32, (t.word8_ & 0xffffffff)) - << dec << endl -#endif + << hex + << ACE_U64_TO_U32(lo) + << dec << endl << "Float: " << t.fpoint_ << endl << "Double: " << t.dprec_ << endl; return os; |