ChangeLogTag: Fri Feb 25 18:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 44 insertions, 52 deletions

diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index d4d13c26d5f..df110c06db5 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -156,7 +156,7 @@ namespace TAO
 
 
 // Stub/skeleton argument selection function templates.
-// TAO_IDL - Generated from be\be_visitor_root/root.cpp:110
+// TAO_IDL - Generated from be\be_visitor_root/root.cpp:111
 
 namespace
 {
@@ -514,7 +514,7 @@ POA_CORBA::DomainManager::~DomainManager (void)
 
 void POA_CORBA::DomainManager::get_domain_policy_skel (
     TAO_ServerRequest & server_request,
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -558,7 +558,6 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
   
   private:
@@ -616,7 +615,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
 
 void POA_CORBA::DomainManager::_is_a_skel (
     TAO_ServerRequest & server_request, 
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -660,7 +659,6 @@ void POA_CORBA::DomainManager::_is_a_skel (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
   
   private:
@@ -715,7 +713,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
 
 void POA_CORBA::DomainManager::_non_existent_skel (
     TAO_ServerRequest & server_request, 
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -752,9 +750,8 @@ void POA_CORBA::DomainManager::_non_existent_skel (
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
-    
+  
   private:
     
     POA_CORBA::DomainManager * const servant_;
@@ -854,7 +851,7 @@ void POA_CORBA::DomainManager::_interface_skel (
 
 void POA_CORBA::DomainManager::_component_skel (
     TAO_ServerRequest & server_request, 
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -891,9 +888,8 @@ void POA_CORBA::DomainManager::_component_skel (
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
-    
+  
   private:
     
     POA_CORBA::DomainManager * const servant_;
@@ -1315,7 +1311,7 @@ POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 
 void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     TAO_ServerRequest & server_request,
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -1359,9 +1355,8 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
         , arg_2
         ACE_ENV_ARG_PARAMETER);
       
-      ACE_CHECK;
     }
-    
+  
   private:
     
     POA_CORBA::ConstructionPolicy * const servant_;
@@ -1419,7 +1414,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
 
 void POA_CORBA::ConstructionPolicy::_is_a_skel (
     TAO_ServerRequest & server_request, 
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -1463,7 +1458,6 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
           arg_1
           ACE_ENV_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
   
   private:
@@ -1518,7 +1512,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
 
 void POA_CORBA::ConstructionPolicy::_non_existent_skel (
     TAO_ServerRequest & server_request, 
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -1555,7 +1549,6 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
   
   private:
@@ -1657,7 +1650,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
 
 void POA_CORBA::ConstructionPolicy::_component_skel (
     TAO_ServerRequest & server_request, 
-    void * servant_upcall,
+    void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
@@ -1694,7 +1687,6 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
         
-      ACE_CHECK;
     }
   
   private:
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 5a6be293328..af53240c6f4 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -332,9 +332,9 @@ namespace POA_CORBA
     
     static void
     _get_policy_type_skel (
-        TAO_ServerRequest &req,
-        void *obj,
-        void *context
+        TAO_ServerRequest & server_request,
+        void * servant_upcall,
+        void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -343,9 +343,9 @@ namespace POA_CORBA
     
     static void
     copy_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context
+        TAO_ServerRequest & server_request, 
+        void * servant_upcall,
+        void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -354,9 +354,9 @@ namespace POA_CORBA
     
     static void
     destroy_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context
+        TAO_ServerRequest & server_request, 
+        void * servant_upcall,
+        void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
@@ -445,7 +445,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2127
+    // be\be_interface.cpp:2130
     
     static void
     copy (
@@ -459,7 +459,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2127
+    // be\be_interface.cpp:2130
     
     static void
     destroy (
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index 0dc1f6e4341..d3ff8ba054a 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -29,17 +29,17 @@
 ACE_INLINE
 void
 POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
+    TAO_ServerRequest & server_request,
+    void * servant_upcall,
+    void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy_ptr impl = (POA_CORBA::ConstructionPolicy_ptr) obj;
+  POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
   POA_CORBA::Policy::_get_policy_type_skel (
-      req,
-      (POA_CORBA::Policy_ptr) impl,
-      context
+      server_request,
+      servant_upcall,
+      impl
       ACE_ENV_ARG_PARAMETER
     );
 }
@@ -50,17 +50,17 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
 ACE_INLINE
 void
 POA_CORBA::ConstructionPolicy::copy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
+    TAO_ServerRequest & server_request,
+    void * servant_upcall,
+    void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy_ptr impl = (POA_CORBA::ConstructionPolicy_ptr) obj;
+  POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
   POA_CORBA::Policy::copy_skel (
-      req,
-      (POA_CORBA::Policy_ptr) impl,
-      context
+      server_request,
+      servant_upcall,
+      impl
       ACE_ENV_ARG_PARAMETER
     );
 }
@@ -71,17 +71,17 @@ POA_CORBA::ConstructionPolicy::copy_skel (
 ACE_INLINE
 void
 POA_CORBA::ConstructionPolicy::destroy_skel (
-    TAO_ServerRequest &req,
-    void *obj,
-    void *context
+    TAO_ServerRequest & server_request,
+    void * servant_upcall,
+    void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  POA_CORBA::Policy_ptr impl = (POA_CORBA::ConstructionPolicy_ptr) obj;
+  POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
   POA_CORBA::Policy::destroy_skel (
-      req,
-      (POA_CORBA::Policy_ptr) impl,
-      context
+      server_request,
+      servant_upcall,
+      impl
       ACE_ENV_ARG_PARAMETER
     );
 }