diff options
Diffstat (limited to 'TAO/tao/diffs/Policy.diff')
-rw-r--r-- | TAO/tao/diffs/Policy.diff | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff new file mode 100644 index 00000000000..ad04c75b097 --- /dev/null +++ b/TAO/tao/diffs/Policy.diff @@ -0,0 +1,93 @@ +--- orig/PolicyC.h Wed Feb 6 19:31:31 2002 ++++ PolicyC.h Wed Feb 6 19:34:42 2002 +@@ -23,7 +23,7 @@ + #define _TAO_IDL_ORIG_POLICYC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -32,6 +32,9 @@ + #include "TAO_Export.h" + #include "CurrentC.h" + #include "Policy_ForwardC.h" ++#include "Exception.h" ++#include "Remote_Object_Proxy_Impl.h" ++#include "Encodable.h" + + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -346,6 +349,9 @@ + + class TAO_Export Policy + : public virtual CORBA_Object ++ // **************************************************************** ++ , public virtual TAO_Encodable ++ // **************************************************************** + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) +@@ -407,6 +413,13 @@ + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; ++ ++ // **************************************************************** ++ virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &); ++ virtual CORBA::Boolean _tao_decode (TAO_InputCDR &); ++ virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; ++ virtual TAO_Policy_Scope _tao_scope (void) const; ++ // **************************************************************** + + private: + _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; +--- orig/PolicyC.cpp Wed Feb 6 19:31:31 2002 ++++ PolicyC.cpp Wed Feb 6 19:34:42 2002 +@@ -1678,6 +1678,32 @@ + return "IDL:omg.org/CORBA/Policy:1.0"; + } + ++// **************************************************************** ++CORBA::Boolean ++CORBA::Policy::_tao_encode (TAO_OutputCDR &) ++{ ++ return 0; ++} ++ ++CORBA::Boolean ++CORBA::Policy::_tao_decode (TAO_InputCDR &) ++{ ++ return 0; ++} ++ ++TAO_Cached_Policy_Type ++CORBA::Policy::_tao_cached_type (void) const ++{ ++ return TAO_CACHED_POLICY_UNCACHED; ++} ++ ++TAO_Policy_Scope ++CORBA::Policy::_tao_scope (void) const ++{ ++ return TAO_POLICY_DEFAULT_SCOPE; ++} ++// **************************************************************** ++ + CORBA::PolicyType CORBA::Policy::policy_type ( + + ACE_ENV_SINGLE_ARG_DECL +--- orig/PolicyS.h Wed Feb 6 19:31:31 2002 ++++ PortableServer/PolicyS.h Wed Feb 6 19:35:15 2002 +@@ -23,9 +23,7 @@ + #define _TAO_IDL_ORIG_POLICYS_H_ + + #include "ace/pre.h" +-#include "CurrentS.h" +-#include "Policy_ForwardS.h" +-#include "PolicyC.h" ++#include "tao/PolicyC.h" + + + #if !defined (ACE_LACKS_PRAGMA_ONCE) |