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

1 files changed, 12 insertions, 6 deletions

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;
     }