ChangeLogTag: Mon Mar 21 12:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 64 insertions, 68 deletions

diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 6ed53d8100b..b4e549aed6f 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -530,7 +530,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1521
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index 347298352c0..b4b3fda4f61 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -343,7 +343,7 @@ namespace Messaging
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:132
+// be\be_visitor_root/root.cpp:139
 
 extern TAO_Messaging_Export
 TAO::Collocation_Proxy_Broker *
@@ -488,7 +488,7 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "MessagingC.inl"
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index a208eecf33e..b5f53fa1558 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -263,7 +263,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:985
+// be\be_visitor_interface/interface_ss.cpp:999
 
 TAO::Collocation_Proxy_Broker *
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -327,24 +327,18 @@ POA_Messaging::ReplyHandler::~ReplyHandler (void)
 // TAO_IDL - Generated from 
 // be\be_visitor_interface/interface_ss.cpp:169
 
-void POA_Messaging::ReplyHandler::_is_a_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
+namespace POA_Messaging
 {
   
   
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:74
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
   
-  class Upcall_Command
+  class _is_a_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
-    inline Upcall_Command (
+    inline _is_a_ReplyHandler_Upcall_Command (
       POA_Messaging::ReplyHandler * servant,
       TAO_Operation_Details const * operation_details,
       TAO::Argument * const args[])
@@ -376,12 +370,20 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
     }
   
   private:
-    
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
   
+}
+void POA_Messaging::ReplyHandler::_is_a_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
   
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -400,10 +402,9 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
   static size_t const nargs = 2;
   
   POA_Messaging::ReplyHandler * const impl =
-    static_cast<
-      POA_Messaging::ReplyHandler *> (servant);
+    static_cast<POA_Messaging::ReplyHandler *> (servant);
   
-  Upcall_Command command (
+  _is_a_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
@@ -413,36 +414,28 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
                          , args
                          , nargs
                          , command
-  
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   
 }
 
-void POA_Messaging::ReplyHandler::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
+namespace POA_Messaging
 {
   
   
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:74
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
   
-  class Upcall_Command
+  class _non_existent_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
-    inline Upcall_Command (
+    inline _non_existent_ReplyHandler_Upcall_Command (
       POA_Messaging::ReplyHandler * servant,
       TAO_Operation_Details const * operation_details,
       TAO::Argument * const args[])
@@ -467,12 +460,20 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
     }
   
   private:
-    
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
   
+}
+void POA_Messaging::ReplyHandler::_non_existent_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
   
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -489,10 +490,9 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
   static size_t const nargs = 1;
   
   POA_Messaging::ReplyHandler * const impl =
-    static_cast<
-      POA_Messaging::ReplyHandler *> (servant);
+    static_cast<POA_Messaging::ReplyHandler *> (servant);
   
-  Upcall_Command command (
+  _non_existent_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
@@ -502,13 +502,11 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
                          , args
                          , nargs
                          , command
-  
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   
@@ -517,7 +515,7 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:385
+// be\be_visitor_interface/interface_ss.cpp:393
 
 
 
@@ -540,8 +538,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     }
   
   POA_Messaging::ReplyHandler * const impl =
-    static_cast<
-      POA_Messaging::ReplyHandler *> (servant);
+    static_cast<POA_Messaging::ReplyHandler *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval = 
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -563,24 +560,18 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     }
 }
 
-void POA_Messaging::ReplyHandler::_component_skel (
-    TAO_ServerRequest & server_request, 
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-    ACE_ENV_ARG_DECL
-  )
+namespace POA_Messaging
 {
   
   
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:74
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
   
-  class Upcall_Command
+  class _get_component_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
-    inline Upcall_Command (
+    inline _get_component_ReplyHandler_Upcall_Command (
       POA_Messaging::ReplyHandler * servant,
       TAO_Operation_Details const * operation_details,
       TAO::Argument * const args[])
@@ -605,12 +596,20 @@ void POA_Messaging::ReplyHandler::_component_skel (
     }
   
   private:
-    
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
   
+}
+void POA_Messaging::ReplyHandler::_component_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
   
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
@@ -627,10 +626,9 @@ void POA_Messaging::ReplyHandler::_component_skel (
   static size_t const nargs = 1;
   
   POA_Messaging::ReplyHandler * const impl =
-    static_cast<
-      POA_Messaging::ReplyHandler *> (servant);
+    static_cast<POA_Messaging::ReplyHandler *> (servant);
   
-  Upcall_Command command (
+  _get_component_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
@@ -640,13 +638,11 @@ void POA_Messaging::ReplyHandler::_component_skel (
                          , args
                          , nargs
                          , command
-  
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   
@@ -676,7 +672,7 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:926
+// be\be_visitor_interface/interface_ss.cpp:940
 
 void POA_Messaging::ReplyHandler::_dispatch (
     TAO_ServerRequest & req,
@@ -691,7 +687,7 @@ void POA_Messaging::ReplyHandler::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:877
+// be\be_visitor_interface/interface_ss.cpp:891
 
 Messaging::ReplyHandler *
 POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
index e6b0607477c..da8155e97a8 100644
--- a/TAO/tao/Messaging/MessagingS_T.cpp
+++ b/TAO/tao/Messaging/MessagingS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:683
+// be\be_codegen.cpp:691
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index 44c33204372..37c68985587 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:546
+// be\be_codegen.cpp:554
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_
 #define _TAO_IDL_ORIG_MESSAGINGS_T_H_
@@ -97,7 +97,7 @@ namespace POA_Messaging
 } // module Messaging
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1094
+// be\be_codegen.cpp:1102
 
 #if defined (__ACE_INLINE__)
 #include "MessagingS_T.inl"
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index c04b05fcb82..70b9cf52e1d 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -1718,7 +1718,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1521
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index 67e7cd83994..1fc1f0943f3 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -1967,7 +1967,7 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_No_ImplC.inl"
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index f31d033651c..a7492d838d7 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -196,7 +196,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1521
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 2562c80ef46..7e7d72a1da3 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -265,7 +265,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtri
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_RT_PolicyC.inl"
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index 8da47d023a6..61165fb8e22 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -196,7 +196,7 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1521
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index 75bbb7ea25e..cc418495fba 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -254,7 +254,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScope_PolicyC.inl"
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index 32f9b081488..fc8a8510d45 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -196,7 +196,7 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1521
+// be\be_visitor_root/root.cpp:1528
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index 89febd1db7b..fc66fecee06 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -254,7 +254,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolic
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:961
+// be\be_codegen.cpp:969
 
 #if defined (__ACE_INLINE__)
 #include "TAO_ExtC.inl"