summaryrefslogtreecommitdiff
path: root/TAO/tao/diffs/PortableInterceptor.diff
blob: 3c6138d5b8ec17050e07202aea5571e0a127a34b (plain)
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
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
--- orig/PortableInterceptorC.h	2003-12-24 08:19:51.000000000 -0600
+++ PortableInterceptorC.h	2004-01-01 00:05:09.000000000 -0600
@@ -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:
@@ -31,24 +31,16 @@
 #ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 
-#include "tao/ORB.h"
+#include /**/ "ace/pre.h"
+
+#include "PI_ForwardC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Any.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "PI_ForwardC.h"
-#include "CurrentC.h"
-#include "DynamicC.h"
-#include "Messaging_SyncScopeC.h"
-#include "IOP_CodecC.h"
-#include "IOP_IORC.h"
+#include "tao/Messaging_SyncScopeC.h"
+#include "tao/IOP_CodecC.h"
+#include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -73,6 +65,15 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+// Hand crafted, keeps DynamicC.h and Typecode.h out of header files.
+namespace Dynamic
+{
+  class ParameterList;
+  class ExceptionList;
+  typedef CORBA::StringSeq ContextList;
+  typedef CORBA::StringSeq RequestContext;
+}
+
 // TAO_IDL - Generated from 
 // be/be_visitor_root/root_ch.cpp:63
 
@@ -1292,16 +1293,19 @@
     
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
     
     virtual void tao_ft_interception_point (
-        PortableInterceptor::ServerRequestInfo_ptr ri,
-        CORBA::OctetSeq_out os
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInfo_ptr ,
+        CORBA::OctetSeq_out 
+        ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableInterceptor::ForwardRequest
-      )) = 0;
+        )) {}
+
+#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
     
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
@@ -1462,6 +1466,16 @@
         , CORBA::PolicyError
       )) = 0;
     
+    // Hand-crafted addition.
+    virtual ::CORBA::Policy_ptr _create_policy (
+        CORBA::PolicyType type
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+        , CORBA::PolicyError
+      ));
+
     // TAO_IDL - Generated from
     // be/be_visitor_interface/interface_ch.cpp:196
     
@@ -2121,27 +2135,6 @@
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::IORInterceptor>
-  {
-    static PortableInterceptor::IORInterceptor_ptr tao_duplicate (
-        PortableInterceptor::IORInterceptor_ptr
-      );
-    static void tao_release (
-        PortableInterceptor::IORInterceptor_ptr
-      );
-    static PortableInterceptor::IORInterceptor_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        PortableInterceptor::IORInterceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
   
@@ -2229,5 +2222,6 @@
 #pragma option pop
 #endif /* __BORLANDC__ */
 
-#endif /* ifndef */
+#include /**/ "ace/post.h"
 
+#endif /* ifndef */
--- orig/PortableInterceptorC.i	2003-12-24 08:19:51.000000000 -0600
+++ PortableInterceptorC.i	2003-12-23 21:29:08.000000000 -0600
@@ -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:
--- orig/PortableInterceptorC.cpp	2003-12-24 08:19:51.000000000 -0600
+++ PortableInterceptorC.cpp	2003-12-23 21:29:08.000000000 -0600
@@ -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:
@@ -1801,6 +1801,18 @@
     &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor;
 }
 
+// Hand-crafted.
+
+::CORBA::Policy_ptr
+PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
+                                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CORBA::PolicyError))
+{
+  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
+                    CORBA::Policy::_nil ());
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60