diff options
Diffstat (limited to 'TAO/tao/diffs/PolicyS.h.diff')
| -rw-r--r-- | TAO/tao/diffs/PolicyS.h.diff | 137 |
1 files changed, 93 insertions, 44 deletions
diff --git a/TAO/tao/diffs/PolicyS.h.diff b/TAO/tao/diffs/PolicyS.h.diff index e1a41dd3c1c..bfb2cc7e888 100644 --- a/TAO/tao/diffs/PolicyS.h.diff +++ b/TAO/tao/diffs/PolicyS.h.diff @@ -1,7 +1,21 @@ ---- orig/PolicyS.h Tue Apr 3 14:08:51 2001 -+++ patched/PolicyS.h Tue Apr 3 15:15:22 2001 -@@ -23,7 +23,7 @@ - #define _TAO_IDL_ORIG_POLICYS_H_ +--- orig/PolicyS.h Mon Apr 30 21:23:11 2001 ++++ PolicyS.h Mon Apr 30 21:20:13 2001 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -19,11 +19,11 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_POLICYS_H_ +-#define _TAO_IDL_POLICYS_H_ ++#ifndef _TAO_IDL_ORIG_POLICYS_H_ ++#define _TAO_IDL_ORIG_POLICYS_H_ #include "ace/pre.h" -#include "PolicyC.h" @@ -18,60 +32,95 @@ #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) -@@ -46,11 +48,6 @@ +@@ -46,15 +48,11 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_NAMESPACE POA_CORBA -{ -} --TAO_NAMESPACE_CLOSE +-TAO_NAMESPACE_CLOSE // module CORBA - class POA_CORBA_Policy; typedef POA_CORBA_Policy *POA_CORBA_Policy_ptr; // Forward Classes Declaration -@@ -58,7 +55,7 @@ - class _TAO_CORBA_Policy_Direct_Proxy_Impl; + class _TAO_CORBA_Policy_ThruPOA_Proxy_Impl; ++class _TAO_CORBA_Policy_Direct_Proxy_Impl; class _TAO_CORBA_Policy_Strategized_Proxy_Broker; --class TAO_Export POA_CORBA_Policy : public virtual PortableServer::ServantBase -+class TAO_PortableServer_Export POA_CORBA_Policy : public virtual PortableServer::ServantBase - { - protected: - POA_CORBA_Policy (void); -@@ -172,7 +169,7 @@ - // Strategized Proxy Broker Declaration - // + class TAO_PortableServer_Export POA_CORBA_Policy : public virtual PortableServer::ServantBase +@@ -184,6 +182,7 @@ + ); --class TAO_Export _TAO_CORBA_Policy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Policy_Proxy_Broker -+class TAO_PortableServer_Export _TAO_CORBA_Policy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Policy_Proxy_Broker - { - public: - _TAO_CORBA_Policy_Strategized_Proxy_Broker (void); -@@ -220,7 +217,7 @@ - // ThruPOA Impl. Declaration - // + private: ++ + // Helper methods that takes care to create the proxy + // as soon as their use is necessary. + void create_proxy ( +@@ -191,6 +190,8 @@ + CORBA::Environment &ACE_TRY_ENV + ); + ++private: ++ + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. +@@ -249,11 +250,56 @@ + CORBA::SystemException + )); --class TAO_Export _TAO_CORBA_Policy_ThruPOA_Proxy_Impl : -+class TAO_PortableServer_Export _TAO_CORBA_Policy_ThruPOA_Proxy_Impl : - public virtual ::_TAO_CORBA_Policy_Proxy_Impl, - public virtual TAO_ThruPOA_Object_Proxy_Impl - { -@@ -265,7 +262,7 @@ - // Direct Impl. Declaration - // +- + }; --class TAO_Export _TAO_CORBA_Policy_Direct_Proxy_Impl : ++ + // + // ThruPOA Proxy Impl. Declaration ++/////////////////////////////////////////////////////////////////////// ++ ++ ++/////////////////////////////////////////////////////////////////////// ++// Direct Impl. Declaration ++// ++ +class TAO_PortableServer_Export _TAO_CORBA_Policy_Direct_Proxy_Impl : - public virtual _TAO_CORBA_Policy_Proxy_Impl, - public virtual TAO_Direct_Object_Proxy_Impl - { -@@ -307,7 +304,7 @@ ++ public virtual _TAO_CORBA_Policy_Proxy_Impl, ++ public virtual TAO_Direct_Object_Proxy_Impl ++{ ++public: ++ _TAO_CORBA_Policy_Direct_Proxy_Impl (void); ++ ++ virtual ~_TAO_CORBA_Policy_Direct_Proxy_Impl (void) { } ++ ++ virtual CORBA::PolicyType policy_type ( ++ CORBA_Object *_collocated_tao_target_, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )); ++ ++ virtual CORBA_Policy_ptr copy ( ++ CORBA_Object *_collocated_tao_target_, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )); ++ ++ virtual void destroy ( ++ CORBA_Object *_collocated_tao_target_, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )); ++ ++}; ++ ++ ++// ++// Direct Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> --class TAO_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy -+class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy - { - public: - POA_CORBA_Policy_tie (T &t); |