portableserver.diff

来自「这是广泛使用的通信开源项目,对于大容量,高并发的通讯要求完全能够胜任,他广泛可用」· DIFF 代码 · 共 754 行 · 第 1/2 页

--- orig/PortableServerC.h	Tue Feb  5 16:29:50 2002
+++ PortableServerC.h	Wed Feb  6 19:07:49 2002
@@ -23,14 +23,17 @@
 #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
 #include "ace/pre.h"
-#include "tao/corba.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "portableserver_export.h"
-#include "CurrentC.h"
+#include "tao/CurrentC.h"
+#include "tao/Sequence.h"
+#include "tao/Exception.h"
+#include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -55,8 +58,23 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+class TAO_ServantBase;
+class TAO_ServantBase_var;
+class TAO_RefCountServantBase;
+class TAO_Local_ServantBase;
+class TAO_DynamicImplementation;
+class TAO_POA;
+
 TAO_NAMESPACE  PortableServer
 {
+  typedef TAO_ServantBase ServantBase;
+  typedef TAO_ServantBase_var ServantBase_var;
+  typedef TAO_RefCountServantBase RefCountServantBase;
+  typedef ServantBase *Servant;
+
+  typedef TAO_Local_ServantBase LocalServantBase;
+  typedef TAO_DynamicImplementation DynamicImplementation;
+
   class POA;
   
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
@@ -422,6 +440,7 @@
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
   
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
@@ -468,6 +487,9 @@
   
 #endif /* end #if !defined */
   
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
   
 #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
 #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
@@ -673,6 +695,8 @@
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDs;
   
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
   
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
@@ -693,6 +717,8 @@
     SINGLE_THREAD_MODEL
   };
   
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   typedef ThreadPolicyValue &ThreadPolicyValue_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
   
@@ -833,6 +859,8 @@
   
 #endif /* end #if !defined */
   
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   enum LifespanPolicyValue
   {
     TRANSIENT,
@@ -1277,6 +1305,8 @@
     NO_IMPLICIT_ACTIVATION
   };
   
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
   
@@ -1417,12 +1447,16 @@
   
 #endif /* end #if !defined */
   
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
   
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
   
@@ -1563,6 +1597,8 @@
   
 #endif /* end #if !defined */
   
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   enum RequestProcessingPolicyValue
   {
     USE_ACTIVE_OBJECT_MAP_ONLY,
@@ -1570,6 +1606,8 @@
     USE_SERVANT_MANAGER
   };
   
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
   
@@ -1710,6 +1748,7 @@
   
 #endif /* end #if !defined */
   
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
   
 #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
 #define _PORTABLESERVER_POAMANAGER___PTR_CH_
@@ -1877,6 +1916,8 @@
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
     
+#if (TAO_HAS_MINIMUM_POA == 0)
+
     virtual void hold_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1905,6 +1946,8 @@
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
     
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
     virtual ::PortableServer::POAManager::State get_state (
         
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1930,6 +1973,7 @@
   
 #endif /* end #if !defined */
   
+#if (TAO_HAS_MINIMUM_POA == 0)
   
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
@@ -2314,10 +2358,16 @@
         PortableServer::POA_ptr adapter
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
+#if (TAO_HAS_MINIMUM_CORBA == 0)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::ForwardRequest
       )) = 0;
+#else
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
     
     virtual void etherealize (
         const PortableServer::ObjectId & oid,
@@ -2435,6 +2485,9 @@
     : public virtual PortableServer::ServantManager
   {
   public:
+
+    typedef void *Cookie;
+
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServantLocator_ptr _ptr_type;
     typedef ServantLocator_var _var_type;
@@ -2467,10 +2520,16 @@
         PortableServer::ServantLocator::Cookie & the_cookie
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
+#if (TAO_HAS_MINIMUM_CORBA == 0)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::ForwardRequest
       )) = 0;
+#else
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
     
     virtual void postinvoke (
         const PortableServer::ObjectId & oid,
@@ -2580,6 +2639,7 @@
   
 #endif /* end #if !defined */
   
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
   
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
@@ -2613,6 +2673,10 @@
         return (POA_ptr)0;
       }
     
+    virtual TAO_POA* _tao_poa_downcast(void)
+      {
+        return 0;
+      }
     
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
@@ -2728,6 +2792,7 @@
 
 #endif /* end #if !defined */
     
+#if (TAO_HAS_MINIMUM_POA == 0)
     
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
@@ -2765,6 +2830,7 @@
 
 #endif /* end #if !defined */
     
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
     
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
@@ -2839,7 +2905,6 @@
 
 #endif /* end #if !defined */
     
-    
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
     
@@ -3018,6 +3083,8 @@
         CORBA::SystemException
       )) = 0;
     
+#if (TAO_HAS_MINIMUM_POA == 0)
+
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
         PortableServer::ThreadPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3026,6 +3093,8 @@
         CORBA::SystemException
       )) = 0;
     
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
         PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3050,6 +3119,8 @@
         CORBA::SystemException
       )) = 0;
     
+#if (TAO_HAS_MINIMUM_POA == 0)
+
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
         PortableServer::ImplicitActivationPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3074,6 +3145,8 @@
         CORBA::SystemException
       )) = 0;
     
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
     virtual char * the_name (
         
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3106,6 +3179,7 @@
         CORBA::SystemException
       )) = 0;
     
+#if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
         
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -3159,6 +3233,8 @@
         , PortableServer::POA::WrongPolicy
       )) = 0;
     
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
     virtual ::PortableServer::ObjectId * activate_object (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3279,6 +3355,8 @@
         CORBA::SystemException
       )) = 0;
     
+#if (TAO_HAS_MINIMUM_POA == 0)
+
     virtual ::PortableServer::ObjectId * create_id_for_reference (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -3317,6 +3395,8 @@
         , PortableServer::NotAGroupObject
       )) = 0;
     
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
     
     virtual const char* _interface_repository_id (void) const;
@@ -3519,6 +3599,10 @@
 #endif /* end #if !defined */
   
   
+  TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
+  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
+  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
 }
 TAO_NAMESPACE_CLOSE // module PortableServer
 
@@ -3526,10 +3610,18 @@
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
@@ -3540,12 +3632,18 @@
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&);
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
@@ -3553,6 +3651,8 @@