*** empty log message ***

5 files changed, 39 insertions, 32 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 3299d1ea58d..73ae22e5f95 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,15 @@
+Tue Jan 26 12:01:19 1999  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * ACE_wrappers/tests/CDR_Test.dsp:
+        * ACE_wrappers/tests/CDR_Test.cpp:
+          Added lines to the test code to send the output to
+          the log file, and deleted the unnecessary Header
+          Files folder in the project.
+        * ace/CDR.{i,cpp}:
+          Relocated the longdouble comparison operators'
+          definitions, and moved a misplaced '}', which
+          were causing build errors.
+
 Tue Jan 26 10:55:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* ace/Active_Map_Manager.h: 
diff --git a/ace/CDR.cpp b/ace/CDR.cpp
index d1de9e7f3be..1e806bbe3f8 100644
--- a/ace/CDR.cpp
+++ b/ace/CDR.cpp
@@ -87,6 +87,20 @@ ACE_CDR::grow (ACE_Message_Block *mb, size_t minsize)
   return 0;
 }
 
+#if defined (NONNATIVE_LONGDOUBLE)
+int
+ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const
+{
+  return ACE_OS::memcmp (this->ld, rhs.ld, 16) == 0;
+}
+
+int
+ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
+{
+  return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0;
+}
+#endif /* NONNATIVE_LONGDOUBLE */
+
 // ****************************************************************
 // ****************************************************************
 // ****************************************************************
diff --git a/ace/CDR.i b/ace/CDR.i
index 81163a02ceb..311e744944b 100644
--- a/ace/CDR.i
+++ b/ace/CDR.i
@@ -60,29 +60,16 @@ ACE_CDR::mb_align (ACE_Message_Block *mb)
                                   ACE_CDR::MAX_ALIGNMENT);
   mb->rd_ptr (start);
   mb->wr_ptr (start);
-}
 
 #if defined (ACE_HAS_PURIFY)
-  // This is a good place to zero the buffer. It makes Purify happy.
+  // This is a good place to zero the buffer; this is not needed
+  // by IIOP, but makes Purify happy.
   if (mb->base () != 0)
     {
       (void) ACE_OS::memset (mb->base (), 0, mb->size ());
     }
 #endif /* ACE_HAS_PURIFY */
-
-#if defined (NONNATIVE_LONGDOUBLE)
-int
-ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const
-{
-  return ACE_OS::memcmp (this->ld, rhs.ld, 16) == 0;
-}
-
-int
-ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
-{
-  return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0;
 }
-#endif /* NONNATIVE_LONGDOUBLE */
 
 // ****************************************************************
 
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index 31a25f9144d..9e463258dfa 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -18,6 +18,7 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Get_Opt.h"
 #include "ace/CDR.h"
 
@@ -355,8 +356,10 @@ short_stream (void)
 }
 
 int 
-main (int argc, char *argv[])
+main (int argc, ASYS_TCHAR *argv[])
 {
+  ACE_START_TEST (ASYS_TEXT ("CDR_Test"));
+
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
@@ -431,6 +434,8 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "Long stream - no errors\n\n"));
 
+  ACE_END_TEST;
+
   return 0;
 }
 
diff --git a/tests/CDR_Test.dsp b/tests/CDR_Test.dsp
index 15a361ecdba..960058c371a 100644
--- a/tests/CDR_Test.dsp
+++ b/tests/CDR_Test.dsp
@@ -18,8 +18,7 @@ CFG=CDR_Test - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CDR_Test - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "CDR_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE "CDR_Test - Win32 Alpha Debug" (based on\

  "Win32 (ALPHA) Console Application")

 !MESSAGE 

@@ -100,7 +99,7 @@ SOURCE=.\CDR_Test.cpp
 

 !ELSEIF  "$(CFG)" == "CDR_Test - Win32 Alpha Debug"

 

-DEP_CPP_BARRI=\

+DEP_CPP_CDR_T=\

 	"..\ace\ACE.h"\

 	"..\ace\ACE.i"\

 	"..\ace\Atomic_Op.i"\

@@ -142,7 +141,6 @@ DEP_CPP_BARRI=\
 	"..\ace\Signal.i"\

 	"..\ace\SString.h"\

 	"..\ace\SString.i"\

-	"..\ace\stdcpp.h"\

 	"..\ace\SV_Semaphore_Complex.h"\

 	"..\ace\SV_Semaphore_Complex.i"\

 	"..\ace\SV_Semaphore_Simple.h"\

@@ -161,22 +159,13 @@ DEP_CPP_BARRI=\
 	"..\ace\ws2tcpip.h"\

 	".\test_config.h"\

 	

+NODEP_CPP_CDR_T=\

+	"..\ace\stdcpp.h"\

+	

 

 !ENDIF 

 

 # End Source File

 # End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\test_config.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

 # End Target

 # End Project