Remove cleanup of ACE_HAS_STRING_CLASS

    * ACE/ace/IOStream.h:
    * ACE/ace/README:
    * ACE/ace/config-hpux-11.00.h:
    * ACE/ace/config-lynxos.h:
    * ACE/ace/config-netbsd.h:
    * ACE/ace/config-openbsd.h:
    * ACE/ace/config-openvms.h:
    * ACE/ace/config-qnx.h:
    * ACE/ace/config-rtems.h:
    * ACE/ace/config-suncc-common.h:
    * ACE/ace/config-sunos5.4-g++.h:
    * ACE/ace/config-sunos5.5.h:
    * ACE/ace/config-sunos5.6.h:
    * ACE/ace/config-win32-borland.h:
    * ACE/examples/IOStream/client/iostream_client.cpp:
    * ACE/examples/IOStream/server/iostream_server.cpp:

2 files changed, 0 insertions, 20 deletions

diff --git a/ACE/examples/IOStream/client/iostream_client.cpp b/ACE/examples/IOStream/client/iostream_client.cpp
index e454440ed0b..3d71a72bde5 100644
--- a/ACE/examples/IOStream/client/iostream_client.cpp
+++ b/ACE/examples/IOStream/client/iostream_client.cpp
@@ -32,7 +32,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   int i;
   float f;
 
-#if defined (ACE_HAS_STRING_CLASS)
   ACE_IOStream_String s1;
   ACE_IOStream_String s2;
   server >> s1 >> i >> f >> s2;
@@ -42,13 +41,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   cerr << i << " ";
   cerr << f << " ";
   cerr << s2 << endl;
-#else
-  server >> i >> f;
-
-  cerr << "(" << ACE_OS::getpid () << ") Server sent:\n\t";
-  cerr << "(" << i << ") ";
-  cerr << "(" << f << ")" << endl;
-#endif /* ACE_HAS_STRING_CLASS */
 
   if (server.close () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/examples/IOStream/server/iostream_server.cpp b/ACE/examples/IOStream/server/iostream_server.cpp
index 4ef4a6d3026..f658f703bad 100644
--- a/ACE/examples/IOStream/server/iostream_server.cpp
+++ b/ACE/examples/IOStream/server/iostream_server.cpp
@@ -45,7 +45,6 @@ Handler::handle_input (ACE_HANDLE)
   if (this->peer ().eof ())
     ACE_ERROR_RETURN ((LM_ERROR, "(%P) connection closed\n"), -1);
 
-#if defined (ACE_HAS_STRING_CLASS)
   ACE_IOStream_String s;
 
   if (!(this->peer () >> i >> f >> s))
@@ -57,17 +56,6 @@ Handler::handle_input (ACE_HANDLE)
   if (!(this->peer () << "Received: " << i << " " << f << " " << s << endl))
     ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error sending data"), -1);
 
-#else
-  if (!(this->peer () >> i >> f))
-    ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error getting data"), -1);
-
-  cerr << "(" << ACE_OS::getpid () << ") Client sent:\n\t";
-  cerr << "(" << i << ") (" << f << ")" << endl;
-
-  if (!(this->peer () << i << " " << f << endl))
-    ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error sending data"), -1);
-#endif /* ACE_HAS_STRING_CLASS */
-
   // In order to flush the output to the peer, we have to use the sync
   // () function.  Some iostreams implementations let us use a 'flush'
   // function much like the 'endl' function.