removed unnecessary #include of ace/streams.h

6 files changed, 99 insertions, 109 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/Ior_Multicast.cpp b/TAO/orbsvcs/orbsvcs/Naming/Ior_Multicast.cpp
index 9a57c6ec844..7c846b01287 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Ior_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Ior_Multicast.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "ace/streams.h"
-
 #include "orbsvcs/Naming/CosNaming_i.h"
 #include "Ior_Multicast.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 13fd4ee9f63..0d4f35dcf6b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -17,7 +17,6 @@
 //
 // ============================================================================
 
-#include "ace/streams.h"
 #include "orbsvcs/CosNamingC.h"
 #include "tao/corba.h"
 #include "Naming_Utils.h"
@@ -52,28 +51,28 @@ TAO_Naming_Server::init (CORBA::ORB_var &orb,
         naming_context_impl_._this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      PortableServer::ObjectId_var id = 
-	PortableServer::string_to_ObjectId ("NameService");
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("NameService");
 
       child_poa->activate_object_with_id (id.in (),
                                           &naming_context_impl_,
                                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
-      
+
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
-      CORBA::Object_var obj = 
-	child_poa->id_to_reference (id.in (),
+      CORBA::Object_var obj =
+        child_poa->id_to_reference (id.in (),
                                     TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       CORBA::String_var str =
-	orb->object_to_string (obj.in (),
-			       TAO_TRY_ENV);
+        orb->object_to_string (obj.in (),
+                               TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "listening as object <%s>\n",
                   str.in ()));
 
@@ -81,23 +80,23 @@ TAO_Naming_Server::init (CORBA::ORB_var &orb,
       // Get reactor instance from TAO.
       ACE_Reactor *reactor =
         TAO_ORB_Core_instance ()->reactor ();
-  
+
       // First, see if the user has given us a multicast port number
       // for the name service on the command-line;
       u_short port =
         TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
 
       if (port == 0)
-	{
-	  const char *port_number =
+        {
+          const char *port_number =
             ACE_OS::getenv ("NameServicePort");
 
-	  if (port_number != 0)
-	    port = ACE_OS::atoi (port_number);
-	}
+          if (port_number != 0)
+            port = ACE_OS::atoi (port_number);
+        }
 
       if (port == 0)
-	port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
+        port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
 
       char *naming_ior = ACE_OS::strdup (str.in ());
 
@@ -106,16 +105,16 @@ TAO_Naming_Server::init (CORBA::ORB_var &orb,
                       IOR_Multicast (naming_ior,
                                      port,
                                      ACE_DEFAULT_MULTICAST_ADDR,
-				     TAO_SERVICEID_NAMESERVICE),
+                                     TAO_SERVICEID_NAMESERVICE),
                       -1);
-      
+
       // Register event handler for the ior multicast.
       if (reactor->register_handler (ior_multicast_,
-				     ACE_Event_Handler::READ_MASK) == -1)
-	ACE_DEBUG ((LM_DEBUG,
+                                     ACE_Event_Handler::READ_MASK) == -1)
+        ACE_DEBUG ((LM_DEBUG,
                     "cannot register Event handler\n"));
       else
-	ACE_DEBUG ((LM_DEBUG,
+        ACE_DEBUG ((LM_DEBUG,
                     "The multicast server setup is done.\n"));
 #endif /* ACE_HAS_IP_MULTICAST */
     }
@@ -149,5 +148,3 @@ TAO_Naming_Server::~TAO_Naming_Server (void)
 {
   delete ior_multicast_;
 }
-
-
diff --git a/TAO/orbsvcs/tests/Logger/clnt.cpp b/TAO/orbsvcs/tests/Logger/clnt.cpp
index 8fbac9b997b..76bffe1ae75 100644
--- a/TAO/orbsvcs/tests/Logger/clnt.cpp
+++ b/TAO/orbsvcs/tests/Logger/clnt.cpp
@@ -8,18 +8,17 @@
 // = FILENAME
 //    clnt.cpp
 //
-// = DESCRIPTION 
+// = DESCRIPTION
 //    This program tests an implementation of a logger service.  It uses the
 //    Logger_Factory server to create a number of logger objects.  It then
 //    uses their object references to test functions supported by the
-//    logger server. 
+//    logger server.
 //
 // = AUTHORS
 //      Sergio Flores-Gaitan
 //
 // ============================================================================
 
-#include "ace/streams.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "orbsvcs/CosNamingC.h"
@@ -57,8 +56,8 @@ Logger_Client::parse_args (void)
                            " [-d]"
                            " [-n]"
                            "\n"
-			   "    -d: increase debug level\n"
-			   "    -n: test nesting in Naming Service\n",
+                           "    -d: increase debug level\n"
+                           "    -n: test nesting in Naming Service\n",
                            this->argv_ [0]),
                           -1);
       }
@@ -75,12 +74,12 @@ Logger_Client::run (void)
   TAO_TRY
     {
       CORBA::String_var msg1 =
-	CORBA::string_copy ("Logging at logger 1");
+        CORBA::string_copy ("Logging at logger 1");
       this->logger_1_->log (msg1.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       CORBA::String_var msg2 =
-	CORBA::string_copy ("Logging at logger 2");
+        CORBA::string_copy ("Logging at logger 2");
       this->logger_2_->log (msg2.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -107,70 +106,70 @@ Logger_Client::init (int argc, char **argv)
   TAO_TRY
     {
       // Initialize ORB.
-      this->orb_ = 
-	CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      this->orb_ =
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       CORBA::Object_var naming_obj =
-	this->orb_->resolve_initial_references ("NameService");
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize the POA.\n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          -1);
 
-      CosNaming::NamingContext_var naming_context = 
+      CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
-      
+
       ACE_DEBUG ((LM_DEBUG, "Obtained naming_context\n"));
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
-	return -1;
+        return -1;
 
       CosNaming::Name factory_name(1);
       factory_name.length (1);
-      factory_name[0].id = CORBA::string_dup ("logger_factory");  
+      factory_name[0].id = CORBA::string_dup ("logger_factory");
 
-      CORBA::Object_var factory_ref = 
-	naming_context->resolve (factory_name, TAO_TRY_ENV);
+      CORBA::Object_var factory_ref =
+        naming_context->resolve (factory_name, TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       /// The following resolve() must fail with an exception.
 
       CosNaming::Name factory_name2(1);
       factory_name2.length (1);
-      factory_name2[0].id = CORBA::string_dup ("logger_factory2");  
+      factory_name2[0].id = CORBA::string_dup ("logger_factory2");
 
-      CORBA::Object_var factory_ref2 = 
-	naming_context->resolve (factory_name2, TAO_TRY_ENV);
+      CORBA::Object_var factory_ref2 =
+        naming_context->resolve (factory_name2, TAO_TRY_ENV);
 
       if (TAO_TRY_ENV.exception ())
-	{
-	  CosNaming::NamingContext::NotFound_ptr ex;
-	  ex = CosNaming::NamingContext::NotFound::_narrow (TAO_TRY_ENV.exception ());
-	  if (ex != 0)
-	    TAO_TRY_ENV.print_exception ("Negative test case for name not found, succeeded\n");
-	  else
-	    TAO_TRY_ENV.print_exception ("Negative test case for name not found, FAILED!\n");
-	}
+        {
+          CosNaming::NamingContext::NotFound_ptr ex;
+          ex = CosNaming::NamingContext::NotFound::_narrow (TAO_TRY_ENV.exception ());
+          if (ex != 0)
+            TAO_TRY_ENV.print_exception ("Negative test case for name not found, succeeded\n");
+          else
+            TAO_TRY_ENV.print_exception ("Negative test case for name not found, FAILED!\n");
+        }
 
       if (CORBA::is_nil (factory_ref.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR, "resolved to nil object"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "resolved to nil object"), -1);
 
       ACE_DEBUG ((LM_DEBUG, "Logger_Factory resolved\n"));
-      
-      Logger_Factory_var factory = 
-	Logger_Factory::_narrow (factory_ref.in (), TAO_TRY_ENV);
+
+      Logger_Factory_var factory =
+        Logger_Factory::_narrow (factory_ref.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       if (CORBA::is_nil (factory.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR, "narrow returned nil"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "narrow returned nil"), -1);
 
       ACE_DEBUG ((LM_DEBUG, "Logger_Factory narrowed\n"));
 
       CORBA::String_var str =
-	this->orb_->object_to_string (factory.in (), TAO_TRY_ENV);
+        this->orb_->object_to_string (factory.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "The factory IOR is <%s>\n", str.in ()));
@@ -184,47 +183,47 @@ Logger_Client::init (int argc, char **argv)
       ACE_DEBUG ((LM_DEBUG, "Created two loggers"));
 
       if (CORBA::is_nil (this->logger_1_.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR, "nil logger1"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "nil logger1"), -1);
 
       if (CORBA::is_nil (this->logger_2_.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR, "nil logger2"), -1);
+        ACE_ERROR_RETURN ((LM_ERROR, "nil logger2"), -1);
 
       ACE_DEBUG ((LM_DEBUG, "Created two loggers\n"));
 
       if (this->test_nesting_)
-	{
-	  CosNaming::Name nested(1);
-	  nested.length (1);
-	  nested[0].id = CORBA::string_dup ("my_naming_context_1");
+        {
+          CosNaming::Name nested(1);
+          nested.length (1);
+          nested[0].id = CORBA::string_dup ("my_naming_context_1");
+
+          CosNaming::NamingContext_var nc1 =
+            naming_context->bind_new_context (nested, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-	  CosNaming::NamingContext_var nc1 = 
-	    naming_context->bind_new_context (nested, TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
+          if (CORBA::is_nil (nc1.in ()))
+            ACE_ERROR_RETURN ((LM_ERROR, "nil nested context"), -1);
 
-	  if (CORBA::is_nil (nc1.in ()))
-	    ACE_ERROR_RETURN ((LM_ERROR, "nil nested context"), -1);
- 
-	  ACE_DEBUG ((LM_DEBUG, "Nested naming context created\n"));
+          ACE_DEBUG ((LM_DEBUG, "Nested naming context created\n"));
 
-	  CosNaming::Name logger1_name (1);
-	  logger1_name.length (1);
-	  logger1_name[0].id = CORBA::string_dup ("logger_1_");
-	  nc1->bind (logger1_name, this->logger_1_.in (), TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
+          CosNaming::Name logger1_name (1);
+          logger1_name.length (1);
+          logger1_name[0].id = CORBA::string_dup ("logger_1_");
+          nc1->bind (logger1_name, this->logger_1_.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-	  ACE_DEBUG ((LM_DEBUG, "Bind in nested context succeded\n"));
+          ACE_DEBUG ((LM_DEBUG, "Bind in nested context succeded\n"));
 
-	  nc1->unbind (logger1_name, TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
+          nc1->unbind (logger1_name, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-	  ACE_DEBUG ((LM_DEBUG, "Unbind in nested context succeded\n"));
+          ACE_DEBUG ((LM_DEBUG, "Unbind in nested context succeded\n"));
 
-	  // destroy the naming context created above.
-	  nc1->destroy (TAO_TRY_ENV);
-	  TAO_CHECK_ENV;
+          // destroy the naming context created above.
+          nc1->destroy (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-	  ACE_DEBUG ((LM_DEBUG, "destroy of nested context succeded\n"));
-	}
+          ACE_DEBUG ((LM_DEBUG, "destroy of nested context succeded\n"));
+        }
     }
   TAO_CATCHANY
     {
@@ -242,7 +241,7 @@ int
 main (int argc, char **argv)
 {
   Logger_Client logger_client;
- 
+
   if (logger_client.init (argc, argv) != 0)
     return 1;
 
diff --git a/TAO/orbsvcs/tests/Logger/logger_i.cpp b/TAO/orbsvcs/tests/Logger/logger_i.cpp
index 1813b3f3708..8d3892b2648 100644
--- a/TAO/orbsvcs/tests/Logger/logger_i.cpp
+++ b/TAO/orbsvcs/tests/Logger/logger_i.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "ace/streams.h"
 #include "ace/ACE.h"
 #include "orbsvcs/LoggerC.h"
 #include "logger_i.h"
 
-Logger_ptr 
+Logger_ptr
 Logger_Factory_i::make_logger (const char* name,
-			       CORBA::Environment &_env) 
+                               CORBA::Environment &_env)
 {
   Logger_i *l = new Logger_i (name);
   return l->_this (_env);
@@ -27,7 +26,7 @@ Logger_i::~Logger_i (void)
   ACE_OS::free (this->name_);
 }
 
-void 
+void
 Logger_i::log (const char* message, CORBA::Environment &_env)
 {
 }
diff --git a/TAO/orbsvcs/tests/Logger/logger_i.h b/TAO/orbsvcs/tests/Logger/logger_i.h
index 889df251e04..91e00f59683 100644
--- a/TAO/orbsvcs/tests/Logger/logger_i.h
+++ b/TAO/orbsvcs/tests/Logger/logger_i.h
@@ -3,7 +3,6 @@
 #define LOGGER_I_H
 
 #include "orbsvcs/LoggerS.h"
-#include "ace/streams.h"
 
 class Logger_Factory_i : public virtual POA_Logger_Factory
 {
@@ -12,7 +11,7 @@ public:
   // constructor.
 
   virtual Logger_ptr make_logger (const char *name,
-				  CORBA::Environment &_env);
+                                  CORBA::Environment &_env);
   // This function creates and returns a logger with the given name.
 };
 
@@ -25,8 +24,8 @@ public:
   virtual ~Logger_i (void);
   // destructor
 
-  virtual void log (const char *message, 
-		    CORBA::Environment &_env);
+  virtual void log (const char *message,
+                    CORBA::Environment &_env);
 
 private:
   char *name_;
diff --git a/TAO/orbsvcs/tests/Logger/svr.cpp b/TAO/orbsvcs/tests/Logger/svr.cpp
index a1d9e52fa8f..54aab944dee 100644
--- a/TAO/orbsvcs/tests/Logger/svr.cpp
+++ b/TAO/orbsvcs/tests/Logger/svr.cpp
@@ -8,17 +8,16 @@
 // = FILENAME
 //    svr.cpp
 //
-// = DESCRIPTION 
-//    This program is an implementation of a simple logger service.  
+// = DESCRIPTION
+//    This program is an implementation of a simple logger service.
 //    Whatever is sent to it through its interface is displayed on stdout.
-//    It uses the Logger_Factory server to create logger objects.  
+//    It uses the Logger_Factory server to create logger objects.
 //
 // = AUTHORS
 //    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
 //
 // ============================================================================
 
-#include "ace/streams.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/LoggerS.h"
 #include "logger_i.h"
@@ -32,7 +31,7 @@ main (int argc, char ** argv)
       TAO_CHECK_ENV;
 
       // Initialize the Object Adapter
-      CORBA::Object_var poa_object = 
+      CORBA::Object_var poa_object =
 	orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil(poa_object.in()))
 	ACE_ERROR_RETURN ((LM_ERROR,
@@ -46,7 +45,7 @@ main (int argc, char ** argv)
       PortableServer::POAManager_var poa_manager =
 	root_poa->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-  
+
       CORBA::Object_var naming_obj =
 	orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
@@ -54,9 +53,9 @@ main (int argc, char ** argv)
 			   " (%P|%t) Unable to resolve the Name Service.\n"),
 			  1);
 
-      ACE_DEBUG ((LM_DEBUG, "Naming Service resolved.\n"));      
+      ACE_DEBUG ((LM_DEBUG, "Naming Service resolved.\n"));
 
-      CosNaming::NamingContext_var naming_context = 
+      CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -65,7 +64,7 @@ main (int argc, char ** argv)
       // create a factory implementation
       Logger_Factory_i factory_impl;
 
-      Logger_Factory_var factory = 
+      Logger_Factory_var factory =
 	factory_impl._this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -81,7 +80,7 @@ main (int argc, char ** argv)
       factory_name[0].id = CORBA::string_dup ("logger_factory");
       naming_context->bind (factory_name, factory.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
- 
+
 //      naming_context->bind (factory_name, factory.in (), TAO_TRY_ENV);
 //      if (TAO_TRY_ENV.exception () != 0)
 //	{ TAO_TRY_ENV.print_exception ("bind: name already bound\n");
@@ -96,7 +95,7 @@ main (int argc, char ** argv)
 	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
 
-      // unbind the logger factory name 
+      // unbind the logger factory name
       naming_context->unbind (factory_name, TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
@@ -108,4 +107,3 @@ main (int argc, char ** argv)
 
   return 0;
 }
-