#include the .i file in the .h/.cpp files instead of corba.h

10 files changed, 58 insertions, 66 deletions

diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index b759ac5157a..c3f4effb9c8 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -3,6 +3,10 @@
 #include "tao/corba.h"
 #include "tao/Timeprobe.h"
 
+#if !defined (__ACE_INLINE__)
+# include "tao/Connect.i"
+#endif /* ! __ACE_INLINE__ */
+
 TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (ACE_Thread_Manager* t)
   : TAO_SVC_HANDLER (t, 0, 0)
 {
@@ -46,9 +50,9 @@ TAO_Server_Connection_Handler::open (void*)
 #if defined (TCP_NODELAY)
   int nodelay = 1;
   if (this->peer ().set_option (IPPROTO_TCP,
-				TCP_NODELAY,
-				(void *) &nodelay,
-				sizeof (nodelay)) == -1)
+                                TCP_NODELAY,
+                                (void *) &nodelay,
+                                sizeof (nodelay)) == -1)
     return -1;
 #endif /* TCP_NODELAY */
 
@@ -61,8 +65,8 @@ TAO_Server_Connection_Handler::open (void*)
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) connection from client %s\n",
-	      client));
+              "(%P|%t) connection from client %s\n",
+              client));
   return 0;
 }
 
@@ -71,8 +75,8 @@ TAO_Server_Connection_Handler::handle_close (ACE_HANDLE handle,
                                              ACE_Reactor_Mask rm)
 {
   ACE_DEBUG  ((LM_DEBUG,
-	       "(%P|%t) TAO_Server_Connection_Handler::handle_close (%d, %d)\n",
-	       handle,
+               "(%P|%t) TAO_Server_Connection_Handler::handle_close (%d, %d)\n",
+               handle,
                rm));
 
   return TAO_SVC_HANDLER::handle_close (handle, rm);
@@ -132,7 +136,7 @@ TAO_Server_Connection_Handler::recv_request (CDR &msg,
     case TAO_GIOP::Reply:
     case TAO_GIOP::LocateReply:
     case TAO_GIOP::CloseConnection:
-    default:					// Unknown message
+    default:                                    // Unknown message
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Illegal message received by server\n"));
       env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
@@ -361,7 +365,7 @@ TAO_Server_Connection_Handler::handle_request (const TAO_GIOP_RequestHeader &hdr
            i < svr_req.params_->count ();
            i++)
         {
-          CORBA::NamedValue_ptr	nv = svr_req.params_->item (i, env);
+          CORBA::NamedValue_ptr nv = svr_req.params_->item (i, env);
           CORBA::Any_ptr any;
 
           if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
@@ -490,9 +494,9 @@ TAO_Client_Connection_Handler::open (void *)
 
   int nodelay = 1;
   if (this->peer ().set_option (IPPROTO_TCP,
-				TCP_NODELAY,
-				(void *) &nodelay,
-				sizeof (nodelay)) == -1)
+                                TCP_NODELAY,
+                                (void *) &nodelay,
+                                sizeof (nodelay)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "NODELAY failed\n"), -1);
 
   ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
@@ -629,8 +633,8 @@ TAO_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
                                              ACE_Reactor_Mask rm)
 {
   ACE_DEBUG  ((LM_DEBUG,
-	       "(%P|%t) TAO_Client_Connection_Handler::handle_close (%d, %d)\n",
-	       handle,
+               "(%P|%t) TAO_Client_Connection_Handler::handle_close (%d, %d)\n",
+               handle,
                rm));
 
   return BASECLASS::handle_close (handle, rm);
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
index dfe8c09e1e7..a57496db3b1 100644
--- a/TAO/tao/Connect.h
+++ b/TAO/tao/Connect.h
@@ -65,12 +65,12 @@ public:
 private:
   typedef TAO_SVC_HANDLER BASECLASS;
   // Trait indicating the base class.
-  
+
   u_char expecting_response_;
   // State flag which, if non-zero, indicates that this handler is
   // looking to get input.  Otherwise, any input received is
   // unexpected.
-  
+
   u_char input_available_;
   // Flag indicating whether or not input is available.  Only valid
   // when <expecting_response_> is non-zero.
@@ -88,7 +88,7 @@ public:
   virtual int open (void *);
   // Called by the <Strategy_Acceptor> when the handler is completely
   // connected.  Argument is unused.
-  
+
   virtual int svc (void);
   // Only used when the handler is turned into an active object by
   // calling <activate>.  This serves as the event loop in such cases.
@@ -153,8 +153,12 @@ protected:
   // Pointer to the object adapter parameters.
 };
 
+#if defined (__ACE_INLINE__)
+# include "tao/Connect.i"
+#endif /* __ACE_INLINE__ */
+
 typedef ACE_Strategy_Acceptor<TAO_Server_Connection_Handler,
                               ACE_SOCK_ACCEPTOR>
-	TAO_ACCEPTOR;
+        TAO_ACCEPTOR;
 
 #endif /* TAO_CONNECT_H */
diff --git a/TAO/tao/Connect.i b/TAO/tao/Connect.i
index 9c85c376b4f..b745a5f13f9 100644
--- a/TAO/tao/Connect.i
+++ b/TAO/tao/Connect.i
@@ -1,3 +1,5 @@
+// $Id$
+
 ACE_INLINE TAO_OA_Parameters *
 TAO_Server_Connection_Handler::params (void)
 {
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index abbe018f15a..c821b4025d6 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -204,48 +204,6 @@ extern TAO_Export int operator== (const TAO_ObjectKey &l,
 #include "tao/IIOP_Interpreter.h"
 #include "tao/GIOP.h"
 
-// The following *.i files are always included here
-#  if !defined(__ACE_INLINE__)
-#    undef ACE_INLINE
-#    define ACE_INLINE inline
-#    define do_undef_on_ACE_INLINE
-#  endif
-
-#if 0 /* These are now #included by their .h/.cpp files. */
-#include "tao/ORB_Core.i"
-#include "tao/Typecode.i"
-#include "tao/NVList.i"
-#include "tao/Any.i"
-#include "tao/Stub.i"
-#include "tao/Object.i"
-#include "tao/ORB.i"
-#include "tao/Marshal.i"
-#include "tao/CDR.i"
-#include "tao/GIOP.i"
-#include "tao/IIOP_ORB.i"
-#include "tao/IIOP_Object.i"
-#include "tao/Server_Request.i"
-#include "tao/Request.i"
-#include "tao/params.i"
-#include "Exception.i"
-#endif /* 0 */
-
-#  if defined (do_undef_on_ACE_INLINE)
-#    undef do_undef_on_ACE_INLINE
-#    undef ACE_INLINE
-#    define ACE_INLINE
-#  endif /* do_undef_on_ACE_INLINE */
-
-// The following *.i files are conditionally included here.
-#if defined (__ACE_INLINE__)
-#include "tao/default_client.i"
-#include "tao/default_server.i"
-#include "tao/Connect.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (__ACE_INLINE__)
-#endif /* __ACE_INLINE__ */
-
 #include "tao/singletons.h"
 
 #if !defined (ACE_NESTED_CLASS)
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 3c6d8973af7..da1e817b405 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -1,6 +1,12 @@
+// $Id$
+
 #include "tao/default_client.h"
 #include "tao/ORB_Core.h"
 
+#if !defined (__ACE_INLINE__)
+# include "tao/default_client.i"
+#endif /* ! __ACE_INLINE__ */
+
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
 {
 }
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index c69fd00fe5b..fdb4b783677 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -42,6 +42,10 @@ public:
   // Parse svc.conf arguments
 };
 
+#if defined (__ACE_INLINE__)
+# include "tao/default_client.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
 
 #endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_client.i b/TAO/tao/default_client.i
index fa599c50301..da77e5c9936 100644
--- a/TAO/tao/default_client.i
+++ b/TAO/tao/default_client.i
@@ -1,2 +1,4 @@
+// $Id$
+
 // This is the inline file, which probably shouldn't be used since all
 // the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index b934f4b1617..303650850d1 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -1,6 +1,12 @@
+// $Id$
+
 #include "tao/default_server.h"
 #include "tao/ORB_Core.h"
 
+#if !defined (__ACE_INLINE__)
+# include "tao/default_client.i"
+#endif /* ! __ACE_INLINE__ */
+
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : thread_flags_ (0),
     object_table_size_ (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE),
@@ -102,8 +108,8 @@ TAO_Default_Server_Strategy_Factory::create_object_table (void)
     {
     case TAO_LINEAR:
       ACE_NEW_RETURN (objtable,
-		      TAO_Linear_ObjTable (this->object_table_size_),
-		      0);
+                      TAO_Linear_ObjTable (this->object_table_size_),
+                      0);
       break;
       // Don't do this one right now until we determine how to deal
       // with its reliance on a global singleton.
@@ -122,15 +128,15 @@ TAO_Default_Server_Strategy_Factory::create_object_table (void)
       break;
     case TAO_ACTIVE_DEMUX:
       ACE_NEW_RETURN (objtable,
-		      TAO_Active_Demux_ObjTable (this->object_table_size_),
-		      0);
+                      TAO_Active_Demux_ObjTable (this->object_table_size_),
+                      0);
       break;
     case TAO_DYNAMIC_HASH:
     case TAO_NONE:
     default:
       ACE_NEW_RETURN (objtable,
-		      TAO_Dynamic_Hash_ObjTable (this->object_table_size_),
-		      0);
+                      TAO_Dynamic_Hash_ObjTable (this->object_table_size_),
+                      0);
       break;
     }
 
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index c10693a2505..4f868b5b06c 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -127,6 +127,10 @@ private:
 #endif /* 0 */
 };
 
+#if defined (__ACE_INLINE__)
+# include "tao/default_server.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
 
 #endif /* TAO_DEFAULT_SERVER_FACTORY_H */
diff --git a/TAO/tao/default_server.i b/TAO/tao/default_server.i
index fa599c50301..da77e5c9936 100644
--- a/TAO/tao/default_server.i
+++ b/TAO/tao/default_server.i
@@ -1,2 +1,4 @@
+// $Id$
+
 // This is the inline file, which probably shouldn't be used since all
 // the methods are virtual and will be dynamically linked in anyway.