ChangeLogTag: Tue Aug 21 13:55:31 2001 Jeff Parsons <parsons@cs.wustl.edu>

1 files changed, 75 insertions, 46 deletions

diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index f2e9509a4f6..deb5d88c21e 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -43,6 +42,8 @@
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
+int CORBA_DomainManager::_tao_class_id = 0;
+
 CORBA_DomainManager_ptr
 tao_CORBA_DomainManager_duplicate (
     CORBA_DomainManager_ptr p
@@ -175,25 +176,25 @@ CORBA_DomainManager_var::_retn (void)
 }
 
 ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::duplicate (CORBA_DomainManager_ptr p)
+CORBA_DomainManager_var::tao_duplicate (CORBA_DomainManager_ptr p)
 {
   return ::CORBA_DomainManager::_duplicate (p);
 }
 
 void
-CORBA_DomainManager_var::release (CORBA_DomainManager_ptr p)
+CORBA_DomainManager_var::tao_release (CORBA_DomainManager_ptr p)
 {
   CORBA::release (p);
 }
 
 ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::nil (void)
+CORBA_DomainManager_var::tao_nil (void)
 {
   return ::CORBA_DomainManager::_nil ();
 }
 
 ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::narrow (
+CORBA_DomainManager_var::tao_narrow (
     CORBA::Object *p,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -202,7 +203,7 @@ CORBA_DomainManager_var::narrow (
 }
 
 CORBA::Object *
-CORBA_DomainManager_var::upcast (void *src)
+CORBA_DomainManager_var::tao_upcast (void *src)
 {
   CORBA_DomainManager **tmp =
     ACE_static_cast (CORBA_DomainManager **, src);
@@ -673,7 +674,6 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
-
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
@@ -687,19 +687,32 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&CORBA__TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer != 0
         )
-      {
-        ACE_NEW_RETURN (
-          default_proxy,
-          ::CORBA_DomainManager (
-            stub,
-            1,
-            obj->_servant ()),
-
-          CORBA_DomainManager::_nil ());
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA_DomainManager (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              CORBA_DomainManager::_nil ()
+            );
         }
+
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA_DomainManager (stub, 0, obj->_servant ()), CORBA_DomainManager::_nil ());
-        return default_proxy;
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA_DomainManager (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              CORBA_DomainManager::_nil ()
+            );
+        }
+      
+      return default_proxy;
       }
     else
       return
@@ -711,7 +724,7 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
                   ACE_reinterpret_cast
                     (
                       ptr_arith_t,
-                      &CORBA_DomainManager::_narrow
+                      &CORBA_DomainManager::_tao_class_id
                     )
                 )
           );
@@ -740,9 +753,9 @@ void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type)
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-     &CORBA_DomainManager::_narrow))
+     &CORBA_DomainManager::_tao_class_id))
     retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
 
@@ -792,7 +805,7 @@ static const CORBA::Long _oc_CORBA_DomainManager[] =
   ACE_NTOHL (0x446f6d61),
   ACE_NTOHL (0x696e4d61),
   ACE_NTOHL (0x6e616765),
-  ACE_NTOHL (0x72000000),  // name = CORBA_DomainManager
+  ACE_NTOHL (0x72000000),  // name = DomainManager
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
@@ -810,6 +823,9 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U)
 TAO_NAMESPACE_END
+
+int CORBA_ConstructionPolicy::_tao_class_id = 0;
+
 CORBA_ConstructionPolicy_ptr
 tao_CORBA_ConstructionPolicy_duplicate (
     CORBA_ConstructionPolicy_ptr p
@@ -942,25 +958,25 @@ CORBA_ConstructionPolicy_var::_retn (void)
 }
 
 ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::duplicate (CORBA_ConstructionPolicy_ptr p)
+CORBA_ConstructionPolicy_var::tao_duplicate (CORBA_ConstructionPolicy_ptr p)
 {
   return ::CORBA_ConstructionPolicy::_duplicate (p);
 }
 
 void
-CORBA_ConstructionPolicy_var::release (CORBA_ConstructionPolicy_ptr p)
+CORBA_ConstructionPolicy_var::tao_release (CORBA_ConstructionPolicy_ptr p)
 {
   CORBA::release (p);
 }
 
 ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::nil (void)
+CORBA_ConstructionPolicy_var::tao_nil (void)
 {
   return ::CORBA_ConstructionPolicy::_nil ();
 }
 
 ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::narrow (
+CORBA_ConstructionPolicy_var::tao_narrow (
     CORBA::Object *p,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -969,7 +985,7 @@ CORBA_ConstructionPolicy_var::narrow (
 }
 
 CORBA::Object *
-CORBA_ConstructionPolicy_var::upcast (void *src)
+CORBA_ConstructionPolicy_var::tao_upcast (void *src)
 {
   CORBA_ConstructionPolicy **tmp =
     ACE_static_cast (CORBA_ConstructionPolicy **, src);
@@ -1436,7 +1452,6 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_ConstructionPolicy::_nil ();
-
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
@@ -1450,19 +1465,32 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
           obj->_is_collocated () &&CORBA__TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer != 0
         )
-      {
-        ACE_NEW_RETURN (
-          default_proxy,
-          ::CORBA_ConstructionPolicy (
-            stub,
-            1,
-            obj->_servant ()),
-
-          CORBA_ConstructionPolicy::_nil ());
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA_ConstructionPolicy (
+                  stub,
+                  1,
+                  obj->_servant ()
+                ),
+              CORBA_ConstructionPolicy::_nil ()
+            );
         }
+
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA_ConstructionPolicy (stub, 0, obj->_servant ()), CORBA_ConstructionPolicy::_nil ());
-        return default_proxy;
+        {
+          ACE_NEW_RETURN (
+              default_proxy,
+              ::CORBA_ConstructionPolicy (
+                  stub,
+                  0,
+                  obj->_servant ()
+                ),
+              CORBA_ConstructionPolicy::_nil ()
+            );
+        }
+      
+      return default_proxy;
       }
     else
       return
@@ -1474,7 +1502,7 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
                   ACE_reinterpret_cast
                     (
                       ptr_arith_t,
-                      &CORBA_ConstructionPolicy::_narrow
+                      &CORBA_ConstructionPolicy::_tao_class_id
                     )
                 )
           );
@@ -1508,17 +1536,17 @@ void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Policy::_narrow))
+      &CORBA_Policy::_tao_class_id))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Policy_ptr,
+            CORBA_Policy_ptr,
             this
           )
       );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
 
@@ -1573,7 +1601,7 @@ static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
   ACE_NTOHL (0x74727563),
   ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63790000),  // name = CORBA_ConstructionPolicy
+  ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
 };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
@@ -1587,6 +1615,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
 CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
   &_tc_TAO_tc_CORBA_ConstructionPolicy;
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
@@ -1746,7 +1775,7 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
   ACE_NTOHL (0x696e4d61),
   ACE_NTOHL (0x6e616765),
   ACE_NTOHL (0x724c6973),
-  ACE_NTOHL (0x74000000),  // name = CORBA_DomainManagerList
+  ACE_NTOHL (0x74000000),  // name = DomainManagerList
   CORBA::tk_sequence, // typecode kind
   80, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1767,7 +1796,7 @@ static const CORBA::Long _oc_CORBA_DomainManagerList[] =
       ACE_NTOHL (0x446f6d61),
       ACE_NTOHL (0x696e4d61),
       ACE_NTOHL (0x6e616765),
-      ACE_NTOHL (0x72000000),  // name = CORBA_DomainManager
+      ACE_NTOHL (0x72000000),  // name = DomainManager
 
     0U,