ChangeLogTag: Thu Jan 6 09:52:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 49 insertions, 297 deletions

diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 22cfadb9f5d..79524e52fe1 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -26,13 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:389
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_IMPLREPOS_H_
-#define _TAO_IDL_IMPLREPOS_H_
+#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
+#define _TAO_IDL_ORIG_IMPLREPOS_H_
 
 #include /**/ "ace/pre.h"
 
+#include "tao/PortableServer/ServerObjectS.h"
 #include "ImplRepoC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -53,263 +54,14 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_ImplementationRepository
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-  
-  class ServerObject;
-  typedef ServerObject *ServerObject_ptr;
-  
-  class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-  class _TAO_ServerObject_Direct_Proxy_Impl;
-  class _TAO_ServerObject_Strategized_Proxy_Broker;
-  
-  class TAO_PortableServer_Export ServerObject
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    ServerObject (void);
-  
-  public:
-    // Useful for template programming.
-    typedef ::ImplementationRepository::ServerObject _stub_type;
-    typedef ::ImplementationRepository::ServerObject_ptr _stub_ptr_type;
-    typedef ::ImplementationRepository::ServerObject_var _stub_var_type;
-    
-    ServerObject (const ServerObject& rhs);
-    virtual ~ServerObject (void);
-    
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    
-    static void _is_a_skel (
-        TAO_ServerRequest &req,
-        void *servant,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _non_existent_skel (
-        TAO_ServerRequest &req,
-        void *servant,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _interface_skel (
-        TAO_ServerRequest &req,
-        void *servant,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _component_skel (
-        TAO_ServerRequest &req,
-        void *obj,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    virtual void _dispatch (
-        TAO_ServerRequest &req,
-        void *_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    ::ImplementationRepository::ServerObject *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void ping (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void ping_skel (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void shutdown_skel (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-  };
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
-  class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  public: 
-    _TAO_ServerObject_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
-    
-    TAO::Collocation_Strategy
-    get_strategy (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    void
-    dispatch (
-        CORBA::Object_ptr obj,
-        CORBA::Object_out forward_obj,
-        TAO::Argument ** args,
-        int num_args,
-        const char * op,
-        size_t op_len,
-        TAO::Collocation_Strategy strategy
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
-    
-    static _TAO_ServerObject_Strategized_Proxy_Broker *
-    the_TAO_ServerObject_Strategized_Proxy_Broker (void);
-  };
-  
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    ThruPOA Proxy Impl. Declaration
-  //
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
-  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
-  {
-  public:
-    _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
-    
-    virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    ping (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    shutdown (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-  
-  //
-  //                ThruPOA  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-  
-  class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_ServerObject_Direct_Proxy_Impl (void);
-    
-    virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    ping (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    shutdown (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-  
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
@@ -383,7 +135,7 @@ namespace POA_ImplementationRepository
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
@@ -402,7 +154,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -424,7 +176,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -468,7 +220,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
   {
@@ -478,7 +230,7 @@ namespace POA_ImplementationRepository
     virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     next_n (
@@ -492,7 +244,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     destroy (
@@ -511,7 +263,7 @@ namespace POA_ImplementationRepository
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
   
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
@@ -525,7 +277,7 @@ namespace POA_ImplementationRepository
     virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     next_n (
@@ -539,7 +291,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     destroy (
@@ -560,7 +312,7 @@ namespace POA_ImplementationRepository
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class Administration;
   typedef Administration *Administration_ptr;
@@ -634,7 +386,7 @@ namespace POA_ImplementationRepository
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void activate_server (
         const char * server
@@ -654,7 +406,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void register_server (
         const char * server,
@@ -675,7 +427,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void reregister_server (
         const char * server,
@@ -696,7 +448,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void remove_server (
         const char * server
@@ -715,7 +467,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void shutdown_server (
         const char * server
@@ -734,7 +486,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void server_is_running (
         const char * server,
@@ -755,7 +507,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void server_is_shutting_down (
         const char * server
@@ -774,7 +526,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void find (
         const char * server,
@@ -794,7 +546,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void list (
         ::CORBA::ULong how_many,
@@ -819,7 +571,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -863,7 +615,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl
   {
@@ -873,7 +625,7 @@ namespace POA_ImplementationRepository
     virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     activate_server (
@@ -889,7 +641,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     register_server (
@@ -905,7 +657,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     reregister_server (
@@ -921,7 +673,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     remove_server (
@@ -936,7 +688,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     shutdown_server (
@@ -951,7 +703,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_running (
@@ -966,7 +718,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_shutting_down (
@@ -981,7 +733,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     find (
@@ -996,7 +748,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     list (
@@ -1015,7 +767,7 @@ namespace POA_ImplementationRepository
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
   
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
@@ -1029,7 +781,7 @@ namespace POA_ImplementationRepository
     virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     activate_server (
@@ -1045,7 +797,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     register_server (
@@ -1061,7 +813,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     reregister_server (
@@ -1077,7 +829,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     remove_server (
@@ -1092,7 +844,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     shutdown_server (
@@ -1107,7 +859,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_running (
@@ -1122,7 +874,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_shutting_down (
@@ -1137,7 +889,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     find (
@@ -1152,7 +904,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     list (
@@ -1173,16 +925,16 @@ namespace POA_ImplementationRepository
   
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:994
+// be\be_codegen.cpp:997
 
 
 #if defined (__ACE_INLINE__)
-#include "ImplRepoS.i"
+#include "ImplRepoS.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)