1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
--- orig/PolicyC.h Wed Feb 6 19:31:31 2002
+++ PolicyC.h Fri Feb 8 10:50:48 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 Fri Feb 8 10:50:48 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 Fri Feb 8 10:52:00 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)
@@ -58,7 +56,7 @@
class _TAO_Policy_Direct_Proxy_Impl;
class _TAO_Policy_Strategized_Proxy_Broker;
- class TAO_Export Policy
+ class TAO_PortableServer_Export Policy
: public virtual PortableServer::ServantBase
{
protected:
@@ -164,7 +162,7 @@
// Strategized Proxy Broker Declaration
//
- class TAO_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
+ class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
{
public:
_TAO_Policy_Strategized_Proxy_Broker (void);
@@ -209,7 +207,7 @@
// ThruPOA Impl. Declaration
//
- class TAO_Export _TAO_Policy_ThruPOA_Proxy_Impl :
+ class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl :
public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl
{
@@ -254,7 +252,7 @@
// Direct Impl. Declaration
//
-class TAO_Export _TAO_Policy_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl :
public virtual CORBA::_TAO_Policy_Proxy_Impl,
public virtual TAO_Direct_Object_Proxy_Impl
{
|
