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
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
|
*** include/omniORB3/CORBA_sysdep.h Tue Jun 27 16:23:24 2000
--- cxx56include/omniORB3/CORBA_sysdep.h Thu Jun 29 12:34:15 2000
***************
*** 242,247 ****
--- 242,270 ----
# define OMNI_PREMATURE_INSTANTIATION
// Extra macros from the Compaq C++ 5.x patch (in <top>/patches/) to be
// added here
+ #define OMNI_OPERATOR_REFPTR(T)\
+ typedef T*& _1RTP_##T;\
+ inline operator _1RTP_##T()
+
+ // This platform can't handle:
+ //
+ // template <class T>
+ // struct X {
+ // T t; // (1)
+ // };
+ // struct Y {
+ // typedef X<Y> Z; // (2)
+ // };
+ //
+ // because X<Y> is instantiated at (2) so that T is an incomplete type at (1).
+
+ #define OMNI_CONSTRTYPE_FIX_VAR_MEMBER(T)
+ #define OMNI_CONSTRTYPE_FIX_VAR(T) typedef _CORBA_ConstrType_Fix_Var<T> T##_var;
+
+ // Note that this is only a problem with fixed length constructed types. The
+ // variable length constructed type var uses a pointer, so the forward
+ // declaration is okay.
+
# ifndef OMNI_OPERATOR_REFPTR
# error "Patch for Compaq C++ 5.x has not been applied."
# endif
*** include/omniORB3/CORBA.h Tue Jun 27 16:15:07 2000
--- cxx56include/omniORB3/CORBA.h Thu Jun 29 12:51:16 2000
***************
*** 717,723 ****
}
inline Any_OUT_arg& operator=(Any* p) { _data = p; return *this; }
! operator Any*& () { return _data; }
Any*& ptr() { return _data; }
Any*& _data;
--- 717,723 ----
}
inline Any_OUT_arg& operator=(Any* p) { _data = p; return *this; }
! OMNI_OPERATOR_REFPTR(Any) { return _data; }
Any*& ptr() { return _data; }
Any*& _data;
***************
*** 2310,2316 ****
_data = s._data; return *this;
}
inline ObjectIdList_out& operator=(T* s) { _data = s; return *this; }
! inline operator T*&() { return _data; }
inline T*& ptr() { return _data; }
inline T* operator->() { return _data; }
inline _CORBA_String_element operator [] (_CORBA_ULong i) {
--- 2310,2316 ----
_data = s._data; return *this;
}
inline ObjectIdList_out& operator=(T* s) { _data = s; return *this; }
! OMNI_OPERATOR_REFPTR(T) { return _data; }
inline T*& ptr() { return _data; }
inline T* operator->() { return _data; }
inline _CORBA_String_element operator [] (_CORBA_ULong i) {
*** src/lib/omniORB2/dynamic/pseudo.h Wed Sep 22 14:26:36 1999
--- cxx56src/lib/omniORB2/dynamic/pseudo.h Thu Jun 29 14:06:23 2000
***************
*** 145,151 ****
--- 145,155 ----
virtual CORBA::Boolean NP_is_nil() const;
virtual CORBA::ContextList_ptr NP_duplicate();
+ #if !defined(__DECCXX) || __DECCXX_VER >= 60000000
inline const char*const* NP_list() { return pd_list.NP_data(); }
+ #else
+ inline const char*const* NP_list() { return (const char*const*)pd_list.NP_data(); }
+ #endif
private:
void free_entries();
*** include/omniORB3/stringtypes.h Tue Jun 27 16:15:08 2000
--- cxx56include/omniORB3/stringtypes.h Thu Jun 29 12:46:41 2000
***************
*** 488,494 ****
}
inline ~_CORBA_String_inout() {}
! inline operator char*&() { return _data; }
char*& _data;
--- 488,494 ----
}
inline ~_CORBA_String_inout() {}
! OMNI_OPERATOR_REFPTR(char) { return _data; }
char*& _data;
***************
*** 517,524 ****
inline _CORBA_String_out& operator=(const char* p) {
_data = ((p) ? _CORBA_String_var::string_dup(p) : 0); return *this;
}
!
! operator char*& () { return _data; }
char*& ptr() { return _data; }
char*& _data;
--- 517,523 ----
inline _CORBA_String_out& operator=(const char* p) {
_data = ((p) ? _CORBA_String_var::string_dup(p) : 0); return *this;
}
! OMNI_OPERATOR_REFPTR(char) { return _data; }
char*& ptr() { return _data; }
char*& _data;
*** include/omniORB3/poa.h Tue Jun 27 16:15:08 2000
--- cxx56include/omniORB3/poa.h Thu Jun 29 12:46:41 2000
***************
*** 260,266 ****
inline ObjectId_out(const ObjectId_out& s) : _data(s._data) { }
inline ObjectId_out& operator=(const ObjectId_out& s) { _data = s._data; return *this; }
inline ObjectId_out& operator=(_T* s) { _data = s; return *this; }
! inline operator _T*&() { return _data; }
inline _T*& ptr() { return _data; }
inline _T* operator->() { return _data; }
inline CORBA::Octet& operator [] (_CORBA_ULong i) { return (*_data)[i]; }
--- 260,266 ----
inline ObjectId_out(const ObjectId_out& s) : _data(s._data) { }
inline ObjectId_out& operator=(const ObjectId_out& s) { _data = s._data; return *this; }
inline ObjectId_out& operator=(_T* s) { _data = s; return *this; }
! OMNI_OPERATOR_REFPTR(_T) { return _data; }
inline _T*& ptr() { return _data; }
inline _T* operator->() { return _data; }
inline CORBA::Octet& operator [] (_CORBA_ULong i) { return (*_data)[i]; }
*** include/omniORB3/templateDecls.h Tue Jun 27 16:15:09 2000
--- cxx56include/omniORB3/templateDecls.h Thu Jun 29 12:46:42 2000
***************
*** 682,688 ****
}
inline ~_CORBA_ObjRef_INOUT_arg() {}
! inline operator T*&() { return _data; }
T*& _data;
--- 682,688 ----
}
inline ~_CORBA_ObjRef_INOUT_arg() {}
! OMNI_OPERATOR_REFPTR(T) { return _data; }
T*& _data;
***************
*** 719,725 ****
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! inline operator T*&() { return _data; }
inline T*& ptr() { return _data; }
inline T* operator->() const { return _data; }
--- 719,725 ----
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! OMNI_OPERATOR_REFPTR(T) { return _data; }
inline T*& ptr() { return _data; }
inline T* operator->() const { return _data; }
***************
*** 840,846 ****
inline _CORBA_ConstrType_Fix_OUT_arg(const T_out& p) : _data(p._data) {}
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! inline operator T*&() { return _data; }
inline T*& ptr() { return _data; }
inline T*& operator->() { return _data; }
--- 840,846 ----
inline _CORBA_ConstrType_Fix_OUT_arg(const T_out& p) : _data(p._data) {}
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! OMNI_OPERATOR_REFPTR(T) { return _data; }
inline T*& ptr() { return _data; }
inline T*& operator->() { return _data; }
***************
*** 943,949 ****
inline _CORBA_ConstrType_Variable_OUT_arg(const T_out& p) : _data(p._data) {}
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! inline operator T*&() { return _data; }
inline T*& ptr() { return _data; }
inline T*& operator->() { return _data; }
--- 943,949 ----
inline _CORBA_ConstrType_Variable_OUT_arg(const T_out& p) : _data(p._data) {}
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! OMNI_OPERATOR_REFPTR(T) { return _data; }
inline T*& ptr() { return _data; }
inline T*& operator->() { return _data; }
***************
*** 1044,1050 ****
inline _CORBA_Array_OUT_arg(const T_out& p) : _data(p._data) {}
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! inline operator T*&() { return _data; }
inline T*& ptr() { return _data; }
inline T& operator[] (_CORBA_ULong index) {
return _data[index];
--- 1044,1050 ----
inline _CORBA_Array_OUT_arg(const T_out& p) : _data(p._data) {}
inline T_out& operator=(const T_out& p) { _data = p._data; return *this; }
inline T_out& operator=(T* p) { _data = p; return *this; }
! OMNI_OPERATOR_REFPTR(T) { return _data; }
inline T*& ptr() { return _data; }
inline T& operator[] (_CORBA_ULong index) {
return _data[index];
*** src/lib/omniORB2/omniidl_be/cxx/header/template.py Mon Jun 26 16:24:00 2000
--- cxx56src/lib/omniORB2/omniidl_be/cxx/header/template.py Thu Jun 29 14:18:30 2000
***************
*** 622,628 ****
_data = s;
return *this;
}
! inline operator T*&() { return _data; }
inline T*& ptr() { return _data; }
inline T* operator->() { return _data; }
--- 622,628 ----
_data = s;
return *this;
}
! OMNI_OPERATOR_REFPTR(T) { return _data; }
inline T*& ptr() { return _data; }
inline T* operator->() { return _data; }
***************
*** 656,661 ****
--- 656,682 ----
};
typedef @name@::_var_type @name@_var;
+
+ typedef _CORBA_ConstrType_@type@_OUT_arg< @name@,@name@_var > @name@_out;
+ """
+
+ # Added for DEC C++ 5.6:
+ struct_fix = """\
+ struct @name@ {
+ OMNI_CONSTRTYPE_FIX_VAR_MEMBER(@name@)
+
+ @Other_IDL@
+
+ @members@
+
+ size_t _NP_alignedSize(size_t initialoffset) const;
+ void operator>>= (NetBufferedStream &) const;
+ void operator<<= (NetBufferedStream &);
+ void operator>>= (MemBufferedStream &) const;
+ void operator<<= (MemBufferedStream &);
+ };
+
+ OMNI_CONSTRTYPE_FIX_VAR(@name@)
typedef _CORBA_ConstrType_@type@_OUT_arg< @name@,@name@_var > @name@_out;
"""
*** src/lib/omniORB2/omniidl_be/cxx/header/defs.py Tue Jun 27 16:15:10 2000
--- cxx56src/lib/omniORB2/omniidl_be/cxx/header/defs.py Thu Jun 29 14:18:31 2000
***************
*** 886,897 ****
dims = tyutil.dimsToString(decl_dims))
# Output the structure itself
! stream.out(template.struct,
! name = cxx_name,
! type = type,
! Other_IDL = Other_IDL,
! members = members)
!
self.__insideClass = insideClass
# TypeCode and Any
--- 886,903 ----
dims = tyutil.dimsToString(decl_dims))
# Output the structure itself
! if type == "Fix":
! stream.out(template.struct_fix,
! name = cxx_name,
! type = type,
! Other_IDL = Other_IDL,
! members = members)
! else:
! stream.out(template.struct,
! name = cxx_name,
! type = type,
! Other_IDL = Other_IDL,
! members = members)
self.__insideClass = insideClass
# TypeCode and Any
*** src/lib/omniORB2/omniidl_be/cxx/dynskel/main.py Tue Jun 27 17:15:09 2000
--- cxx56src/lib/omniORB2/omniidl_be/cxx/dynskel/main.py Thu Jul 6 12:47:32 2000
***************
*** 651,657 ****
d_name
if is_array:
thing = docast(memberType, d, thing)
!
assertDefined([ prefix + "_buildDesc" + d_cname ])
cases.out("""\
case @n@:
--- 651,658 ----
d_name
if is_array:
thing = docast(memberType, d, thing)
! elif memberType.deref().objref():
! thing = memberType.objRefTemplate("tcDesc_arg") + "(" + thing + ")"
assertDefined([ prefix + "_buildDesc" + d_cname ])
cases.out("""\
case @n@:
|
