diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 17:39:45 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 17:39:45 +0000 |
| commit | badd4f39e1701387d4c87d3a193b49a376671fde (patch) | |
| tree | ba0876a9be36fd929e71d167b43091d5842b628f | |
| parent | 940be616fb3a5a3ff6679a99465df80b1d2ed391 (diff) | |
| download | ATCD-badd4f39e1701387d4c87d3a193b49a376671fde.tar.gz | |
ChangeLogTag:Thu May 18 10:29:49 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | tests/CDR_File_Test.cpp | 12 | ||||
| -rw-r--r-- | tests/Makefile | 6 |
5 files changed, 41 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 4b24b0c5ccc..7d29ec73709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu May 18 10:29:49 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/Makefile: + Disable the CDR_Array_Test with older versions of g++ because + the test breaks the templates there. + + * tests/CDR_File_Test.cpp: + Use ULongLong instead of LongLong because the former is better + supported. + Thu May 18 10:11:20 2000 Darrell Brunsch <brunsch@uci.edu> * ace/streams.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 4b24b0c5ccc..7d29ec73709 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Thu May 18 10:29:49 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/Makefile: + Disable the CDR_Array_Test with older versions of g++ because + the test breaks the templates there. + + * tests/CDR_File_Test.cpp: + Use ULongLong instead of LongLong because the former is better + supported. + Thu May 18 10:11:20 2000 Darrell Brunsch <brunsch@uci.edu> * ace/streams.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 4b24b0c5ccc..7d29ec73709 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Thu May 18 10:29:49 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/Makefile: + Disable the CDR_Array_Test with older versions of g++ because + the test breaks the templates there. + + * tests/CDR_File_Test.cpp: + Use ULongLong instead of LongLong because the former is better + supported. + Thu May 18 10:11:20 2000 Darrell Brunsch <brunsch@uci.edu> * ace/streams.h: diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index 8833efd1407..c24bba38c7b 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -49,7 +49,7 @@ public: CDR_Test (ACE_CDR::Char o, ACE_CDR::Short s, ACE_CDR::Long w, - ACE_CDR::LongLong lw, + ACE_CDR::ULongLong lw, ACE_CDR::Float f, ACE_CDR::Double d); // Constructor. @@ -61,7 +61,7 @@ private: ACE_CDR::Char char_; ACE_CDR::Short word2_; ACE_CDR::Long word4_; - ACE_CDR::LongLong word8_; + ACE_CDR::ULongLong word8_; ACE_CDR::Float fpoint_; ACE_CDR::Double dprec_; }; @@ -74,13 +74,13 @@ operator << (ostream &os, << "Short: " << t.word2_ << endl << "Long: " << t.word4_ << endl #if !defined(_MSC_VER) - << "LongLong: " << t.word8_ << endl + << "ULongLong: " << t.word8_ << endl #else - << "LongLong 1st half: " + << "ULongLong 1st half: " << hex << ACE_reinterpret_cast(ACE_UINT32, (t.word8_ >> 32)) << dec << endl - << "LongLong 2nd half: " + << "ULongLong 2nd half: " << hex << ACE_reinterpret_cast(ACE_UINT32, (t.word8_ & 0xffffffff)) << dec << endl @@ -103,7 +103,7 @@ CDR_Test::CDR_Test (void) CDR_Test::CDR_Test (ACE_CDR::Char o, ACE_CDR::Short s, ACE_CDR::Long w, - ACE_CDR::LongLong lw, + ACE_CDR::ULongLong lw, ACE_CDR::Float f, ACE_CDR::Double d) : char_ (o), diff --git a/tests/Makefile b/tests/Makefile index c9d9bbb8f7d..3290fae8cac 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -21,7 +21,6 @@ BIN = Aio_Platform_Test \ Cached_Conn_Test \ Capabilities_Test \ CDR_File_Test \ - CDR_Array_Test \ CDR_Test \ Collection_Test \ Conn_Test \ @@ -114,6 +113,11 @@ else BIN2 += Tokens_Test endif # ! Token +ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) +BIN += \ + CDR_Array_Test +endif + PSRC=$(addsuffix .cpp,$(BIN)) #---------------------------------------------------------------------------- |