summaryrefslogtreecommitdiff
path: root/TAO/tao/diffs/MessagingS.h.diff
blob: 2069a5d628a6bd26e6ca8974b8b6c59d69b00c5e (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
--- orig/MessagingS.h   Sun Apr 30 18:03:08 2000
+++ MessagingS.h        Sun Apr 30 18:06:01 2000
@@ -11,11 +11,15 @@
 #define _TAO_IDL_ORIG_MESSAGINGS_H_

 #include "ace/pre.h"
+
+#include "orbconf.h"
+
+#if (TAO_HAS_CORBA_MESSAGING == 1)
+
 #include "TimeBaseS.h"
-#include "IOPS.h"
-#include "PolicyS.h"
-#include "PollableS.h"
 #include "MessagingC.h"
+#include "PortableServerC.h"
+#include "Servant_Base.h"


 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -31,6 +35,9 @@

 TAO_NAMESPACE  POA_Messaging
 {
+
+#if (TAO_HAS_AMI_CALLBACK == 1)
+
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
   class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
@@ -45,7 +52,7 @@

     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );

@@ -57,7 +64,7 @@
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );

@@ -65,19 +72,19 @@
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );

     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );

     ::Messaging::ReplyHandler *_this (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );

@@ -100,11 +107,11 @@
         const CORBA::Char *logical_type_id,
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-
+
     virtual CORBA::Boolean _non_existent(
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-
+
       };


@@ -125,14 +132,14 @@
         const CORBA::Char *logical_type_id,
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-
+
     ReplyHandler_ptr _get_servant (void) const;
-
+
     virtual CORBA::Boolean _non_existent(
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-
-
+
+
   private:
     ReplyHandler_ptr servant_;
   };
@@ -140,7 +147,7 @@

 #endif /* end #if !defined */

-
+
 #if defined (ACE_HAS_USING_KEYWORD)
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
@@ -157,7 +164,7 @@
     // ctor with T*, ownership flag and a POA
     ~ReplyHandler_tie (void);
     // dtor
-
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -169,17 +176,17 @@
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+
     // copy and assignment are not allowed
     ReplyHandler_tie (const ReplyHandler_tie &);
     void operator= (const ReplyHandler_tie &);
@@ -187,6 +194,8 @@

 #endif /* ACE_HAS_USING_KEYWORD */

+#endif /* TAO_HAS_AMI_CALLBACK == 1 */
+
 }
 TAO_NAMESPACE_CLOSE

@@ -199,6 +208,8 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
+
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */

 #include "ace/post.h"
 #endif /* ifndef */