ChangeLogTag:Wed Mar 1 23:47:13 UTC 2006 Steve Huston <shuston@riverace.com>

5 files changed, 14 insertions, 16 deletions

diff --git a/tests/Array_Map_Test.cpp b/tests/Array_Map_Test.cpp
index 32880cea842..791f7280631 100644
--- a/tests/Array_Map_Test.cpp
+++ b/tests/Array_Map_Test.cpp
@@ -285,9 +285,9 @@ index_operator_test (void)
         {
           if ((*n).first  != *letter || (*n).second != *word)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Key/Datum mismatch:\n"
-                                         "    key \"%c\" should be \"%c\"\n"
-                                         "  datum \"%s\" should be \"%s\"\n"),
+                               ACE_TEXT ("Key/Datum mismatch:\n")
+                               ACE_TEXT ("    key \"%c\" should be \"%c\"\n")
+                               ACE_TEXT ("  datum \"%s\" should be \"%s\"\n"),
                                (*n).first,
                                *letter,
                                (*n).second.c_str (),
@@ -324,9 +324,9 @@ index_operator_test (void)
         {
           if ((*r).first != *letter || (*r).second != *word)
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("Key/Datum mismatch:\n"
-                                         "    key \"%c\" should be \"%c\"\n"
-                                         "  datum \"%s\" should be \"%s\"\n"),
+                               ACE_TEXT ("Key/Datum mismatch:\n")
+                               ACE_TEXT ("    key \"%c\" should be \"%c\"\n")
+                               ACE_TEXT ("  datum \"%s\" should be \"%s\"\n"),
                                (*r).first,
                                *letter,
                                (*r).second.c_str (),
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index fec456c2e3f..a628a673112 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -196,7 +196,7 @@ run_test (int write_file,
       output_cdr << cdr_test;
 
       // Output the data to cout.
-#if defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
       // Since CE does not have ostream, ace_file_stream and output_file() cannot
       // be used.  Just use 'hard-coded' file name here.
       (*ACE_CE_OSTREAM::instance()).open(ACE_TEXT("\\Log\\CDR_File_Test.txt"));
@@ -295,7 +295,7 @@ run_test (int write_file,
       // <CDR_Test> object.
       input_cdr >> temp;
 
-#ifdef ACE_HAS_WINCE
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
       (*ACE_CE_OSTREAM::instance()) << temp;
 #else
       *ace_file_stream::instance ()->output_file () << temp;
diff --git a/tests/CE_fostream.cpp b/tests/CE_fostream.cpp
index 7ebb9b168d7..45641fb6e77 100644
--- a/tests/CE_fostream.cpp
+++ b/tests/CE_fostream.cpp
@@ -2,8 +2,8 @@
 
 #include "CE_fostream.h"
 
-// This is CE only.
-#if defined (ACE_HAS_WINCE)
+// This is CE only, prior to availability of iostreams (VC 8).
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 ACE_CE_fostream* ACE_CE_fostream::instance_ = 0;
 
@@ -146,4 +146,4 @@ ACE_CE_fostream& ACE_CE_fostream::operator << (const void* v)
     return *this;
 }
 
-#endif /* ACE_HAS_WINCE */
+#endif /* ACE_HAS_WINCE && ACE_LACKS_IOSTREAMS_TOTALLY */
diff --git a/tests/CE_fostream.h b/tests/CE_fostream.h
index b488aaba3b1..9d84d7fc2be 100644
--- a/tests/CE_fostream.h
+++ b/tests/CE_fostream.h
@@ -21,7 +21,7 @@
 
 #include "ace/config-all.h"
 
-#ifdef ACE_HAS_WINCE
+#if defined (ACE_HAS_WINCE) && defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 #include "ace/Null_Mutex.h"
 #include "ace/Singleton.h"
@@ -101,5 +101,5 @@ private:
 
 typedef ACE_Singleton<ACE_CE_fostream, ACE_Null_Mutex> ACE_CE_OSTREAM;
 
-#endif  // ACE_HAS_WINCE
-#endif  // ACE_CE_fostream_h
+#endif  /* ACE_HAS_WINCE && ACE_LACKS_IOSTREAM_TOTALLY */
+#endif  /* ACE_CE_fostream_h */
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp
index 951d830867c..eb407f5f596 100644
--- a/tests/MT_SOCK_Test.cpp
+++ b/tests/MT_SOCK_Test.cpp
@@ -99,7 +99,6 @@ client (void *arg)
   for (const char *c = ACE_ALPHABET; *c != '\0'; c++)
     if (cli_stream.send_n (c, 1) == -1)
       {
-#if defined (ACE_WIN64)
         // This is, I believe, more of an issue with WinXP-64 _server_
         // side, but we can trap it here since we know we're connecting
         // to localhost. It appears, though I haven't found documentation
@@ -116,7 +115,6 @@ client (void *arg)
             cli_stream.close ();
             return 0;
           }
-#endif /* ACE_WIN64 */
 
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("(%P|%t) (errno %d) %p\n"), errno,