diff options
author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-12 16:34:48 +0000 |
---|---|---|
committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-12 16:34:48 +0000 |
commit | ba69933bdcc17e77afd53a6f7f56707cbe7a9c55 (patch) | |
tree | b3d6b424affddba9fcf117b8069cdb7ca340df31 /TAO/tao | |
parent | eb83cceeda790e24e5803eb28ef0b418e6bbee07 (diff) | |
download | ATCD-ba69933bdcc17e77afd53a6f7f56707cbe7a9c55.tar.gz |
replaced wchar_t with CORBA::WChar
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/encode.cpp | 487 | ||||
-rw-r--r-- | TAO/tao/poa.cpp | 18 | ||||
-rw-r--r-- | TAO/tao/poa.h | 7 | ||||
-rw-r--r-- | TAO/tao/poaC.cpp | 646 | ||||
-rw-r--r-- | TAO/tao/poaC.h | 306 |
5 files changed, 735 insertions, 729 deletions
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 79492194249..1f32d6d806c 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -1,3 +1,5 @@ +// $Id$ +// // ============================================================================ // // = LIBRARY @@ -9,9 +11,10 @@ // = DESCRIPTION // Code for encoding different data types // -// The original code had a single static encoder function defined on the CDR -// class that called traverse to interpret the data types. This version -// defines a virtual method "encode" on each class and avoids calling traverse. +// The original code had a single static encoder function defined on +// the CDR class that called traverse to interpret the data types. +// This version defines a virtual method "encode" on each class and +// avoids calling traverse. // // = AUTHOR // Copyright 1994-1995 by Sun Microsystems Inc. @@ -39,10 +42,10 @@ extern CORBA::TypeCode TC_opaque; CORBA::TypeCode::traverse_status TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::Boolean continue_encoding = CORBA::B_TRUE; CDR *stream = (CDR *) context; // context is the CDR stream @@ -80,7 +83,7 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc, continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data); break; case CORBA::tk_wchar: - continue_encoding = stream->put_wchar (*(wchar_t *) data); + continue_encoding = stream->put_wchar (*(CORBA::WChar *) data); break; default: retval = CORBA::TypeCode::TRAVERSE_STOP; @@ -100,10 +103,10 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Any::encode (CORBA::TypeCode_ptr, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::Any *any = (CORBA::Any *) data; @@ -162,7 +165,7 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr, continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) value); break; case CORBA::tk_wchar: - continue_encoding = stream->put_wchar (*(wchar_t *) value); + continue_encoding = stream->put_wchar (*(CORBA::WChar *) value); break; case CORBA::tk_any: case CORBA::tk_TypeCode: @@ -197,10 +200,10 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::Boolean continue_encoding = CORBA::B_TRUE; CDR *stream = (CDR *) context; // context is the CDR stream @@ -264,10 +267,10 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr, // encode Principal CORBA::TypeCode::traverse_status TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::Boolean continue_encoding = CORBA::B_TRUE; CDR *stream = (CDR *) context; // context is the CDR stream @@ -279,8 +282,8 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr, continue_encoding = stream->put_long (p->id.length); for (u_int i = 0; - continue_encoding && i < p->id.length; - i++) + continue_encoding && i < p->id.length; + i++) continue_encoding = stream->put_octet (p->id.buffer [i]); } else @@ -298,10 +301,10 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr, // encode obj ref CORBA::TypeCode::traverse_status TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CDR *stream = (CDR *) context; // context is the CDR stream @@ -400,10 +403,10 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr, // encode structs CORBA::TypeCode::traverse_status TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CDR *stream = (CDR *) context; CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -418,19 +421,19 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, int member_count = tc->member_count (env); for (int i = 0; - i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE - && continue_encoding == CORBA::B_TRUE; - i++) - { - param = tc->member_type (i, env); - if (env.exception () == 0) - { - size = param->size (env); - if (env.exception () == 0) - { - alignment = param->alignment (env); - if (env.exception () == 0) - { + i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE + && continue_encoding == CORBA::B_TRUE; + i++) + { + param = tc->member_type (i, env); + if (env.exception () == 0) + { + size = param->size (env); + if (env.exception () == 0) + { + alignment = param->alignment (env); + if (env.exception () == 0) + { align_offset = (ptr_arith_t) ptr_align_binary (data, alignment) - (ptr_arith_t) data @@ -441,67 +444,67 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, data = (const void *) ((ptr_arith_t) data + ((align_offset == alignment) ? 0 : align_offset)); - switch (param->kind_) - { - case CORBA::tk_null: - case CORBA::tk_void: - break; - case CORBA::tk_short: - case CORBA::tk_ushort: - continue_encoding = stream->put_short (*(CORBA::Short *) data); - break; - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_enum: - continue_encoding = stream->put_long (*(CORBA::Long *) data); - break; - case CORBA::tk_double: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data); - break; - case CORBA::tk_boolean: - continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data); - break; - case CORBA::tk_char: - case CORBA::tk_octet: - continue_encoding = stream->put_char (*(CORBA::Char *) data); - break; - case CORBA::tk_longdouble: - continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data); - break; - case CORBA::tk_wchar: - continue_encoding = stream->put_wchar (*(wchar_t *) data); - break; - case CORBA::tk_any: - case CORBA::tk_TypeCode: - case CORBA::tk_Principal: - case CORBA::tk_objref: - case CORBA::tk_struct: - case CORBA::tk_union: - case CORBA::tk_string: - case CORBA::tk_sequence: - case CORBA::tk_array: - case CORBA::tk_alias: - case CORBA::tk_except: - case CORBA::tk_wstring: - retval = stream->encode (param, data, 0, env); - break; - default: - break; - } - data = (char *) data + size; - } - else - return CORBA::TypeCode::TRAVERSE_STOP; - } - else - return CORBA::TypeCode::TRAVERSE_STOP; - } - else - return CORBA::TypeCode::TRAVERSE_STOP; - } + switch (param->kind_) + { + case CORBA::tk_null: + case CORBA::tk_void: + break; + case CORBA::tk_short: + case CORBA::tk_ushort: + continue_encoding = stream->put_short (*(CORBA::Short *) data); + break; + case CORBA::tk_long: + case CORBA::tk_ulong: + case CORBA::tk_float: + case CORBA::tk_enum: + continue_encoding = stream->put_long (*(CORBA::Long *) data); + break; + case CORBA::tk_double: + case CORBA::tk_longlong: + case CORBA::tk_ulonglong: + continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data); + break; + case CORBA::tk_boolean: + continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data); + break; + case CORBA::tk_char: + case CORBA::tk_octet: + continue_encoding = stream->put_char (*(CORBA::Char *) data); + break; + case CORBA::tk_longdouble: + continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data); + break; + case CORBA::tk_wchar: + continue_encoding = stream->put_wchar (*(CORBA::WChar *) data); + break; + case CORBA::tk_any: + case CORBA::tk_TypeCode: + case CORBA::tk_Principal: + case CORBA::tk_objref: + case CORBA::tk_struct: + case CORBA::tk_union: + case CORBA::tk_string: + case CORBA::tk_sequence: + case CORBA::tk_array: + case CORBA::tk_alias: + case CORBA::tk_except: + case CORBA::tk_wstring: + retval = stream->encode (param, data, 0, env); + break; + default: + break; + } + data = (char *) data + size; + } + else + return CORBA::TypeCode::TRAVERSE_STOP; + } + else + return CORBA::TypeCode::TRAVERSE_STOP; + } + else + return CORBA::TypeCode::TRAVERSE_STOP; + } } else return CORBA::TypeCode::TRAVERSE_STOP; @@ -520,10 +523,10 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, // encode unions CORBA::TypeCode::traverse_status TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *data2, - void *context, - CORBA::Environment &env) + const void *data, + const void *data2, + void *context, + CORBA::Environment &env) { CDR *stream = (CDR *) context; // context is the CDR stream @@ -543,7 +546,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, // encode the discriminator value CORBA::TypeCode::traverse_status retval = - stream->encode (discrim_tc, data, data2, env); + stream->encode (discrim_tc, data, data2, env); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -551,7 +554,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, if (env.exception () == 0) { discrim_val = data; // save the pointer to the discriminator - // value + // value // move the pointer to point to the actual value data = (char *) data + discrim_size_with_pad; data2 = (char *) data2 + discrim_size_with_pad; @@ -559,7 +562,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, default_index = tc->default_index (env); if (env.exception () == 0) { - // get the member count + // get the member count member_count = tc->member_count (env); if (env.exception () == 0) { @@ -579,25 +582,25 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, case CORBA::tk_short: case CORBA::tk_ushort: if (*(CORBA::Short *) member_label->value () == *(CORBA::Short *) discrim_val) - discrim_matched = CORBA::B_TRUE; + discrim_matched = CORBA::B_TRUE; break; case CORBA::tk_long: case CORBA::tk_ulong: case CORBA::tk_enum: if (*(CORBA::ULong *) member_label->value () == *(CORBA::ULong *) discrim_val) - discrim_matched = CORBA::B_TRUE; + discrim_matched = CORBA::B_TRUE; break; case CORBA::tk_char: if (*(CORBA::Char *) member_label->value () == *(CORBA::Char *) discrim_val) - discrim_matched = CORBA::B_TRUE; + discrim_matched = CORBA::B_TRUE; break; case CORBA::tk_wchar: if (*(CORBA::WChar *) member_label->value () == *(CORBA::WChar *) discrim_val) - discrim_matched = CORBA::B_TRUE; + discrim_matched = CORBA::B_TRUE; break; case CORBA::tk_boolean: if (*(CORBA::Boolean *) member_label->value () == *(CORBA::Boolean *) discrim_val) - discrim_matched = CORBA::B_TRUE; + discrim_matched = CORBA::B_TRUE; break; default: env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); @@ -616,9 +619,9 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, default_tc = member_tc; } if (discrim_matched) - // marshal according to the matched typecode - return stream->encode (member_tc, data, - data2, env); + // marshal according to the matched typecode + return stream->encode (member_tc, data, + data2, env); } else // error getting member type { @@ -637,13 +640,13 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, } // end of while // we are here only if there was no match if (default_tc) - return stream->encode (default_tc, data, data2, env); + return stream->encode (default_tc, data, data2, env); else - { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - dmsg ("Union::encode - failed. No match and no default case"); - return CORBA::TypeCode::TRAVERSE_STOP; - } + { + env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + dmsg ("Union::encode - failed. No match and no default case"); + return CORBA::TypeCode::TRAVERSE_STOP; + } } else // error getting member count { @@ -684,10 +687,10 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, // encode string CORBA::TypeCode::traverse_status TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::Boolean continue_encoding = CORBA::B_TRUE; CDR *stream = (CDR *) context; // context is the CDR stream @@ -707,7 +710,7 @@ TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc, if (env.exception () == 0) { // get the actual length of the string - CORBA::ULong len = ACE_OS::strlen ((char *) str); + CORBA::ULong len = ACE_OS::strlen ((char *) str); // if it is an unbounded string or if the length is less // than the bounds for an unbounded string @@ -717,21 +720,21 @@ TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc, // Encode the string, followed by a NUL character. for (continue_encoding = stream->put_ulong (len + 1); // length + - // 1 for - // the NULL - // character + // 1 for + // the NULL + // character continue_encoding != CORBA::B_FALSE && *str; continue_encoding = stream->put_char (*str++)) continue; - // put a NULL terminating character + // put a NULL terminating character stream->put_char (0); return CORBA::TypeCode::TRAVERSE_CONTINUE; } else - return CORBA::TypeCode::TRAVERSE_STOP; + return CORBA::TypeCode::TRAVERSE_STOP; } else - return CORBA::TypeCode::TRAVERSE_STOP; + return CORBA::TypeCode::TRAVERSE_STOP; } else { @@ -800,7 +803,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_long: case CORBA::tk_ulong: @@ -813,7 +816,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_double: case CORBA::tk_longlong: @@ -826,7 +829,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_boolean: // For primitives, compute the size only once @@ -837,7 +840,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_char: case CORBA::tk_octet: @@ -849,7 +852,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_longdouble: // For primitives, compute the size only once @@ -860,7 +863,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_wchar: // For primitives, compute the size only once @@ -871,7 +874,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_enum: // For primitives, compute the size only once @@ -882,7 +885,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; // handle all aggregate types here case CORBA::tk_any: @@ -974,7 +977,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_long: case CORBA::tk_ulong: @@ -987,7 +990,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_double: case CORBA::tk_longlong: @@ -1000,7 +1003,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_boolean: // For primitives, compute the size only once @@ -1011,7 +1014,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_char: case CORBA::tk_octet: @@ -1023,7 +1026,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_longdouble: // For primitives, compute the size only once @@ -1047,7 +1050,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; case CORBA::tk_enum: // For primitives, compute the size only once @@ -1058,7 +1061,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, } // CORBA::release (tc2); if (continue_encoding == CORBA::B_TRUE) - return CORBA::TypeCode::TRAVERSE_CONTINUE; + return CORBA::TypeCode::TRAVERSE_CONTINUE; break; // handle all aggregate types here case CORBA::tk_any: @@ -1098,10 +1101,10 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::TypeCode_ptr tc2; // typecode of the aliased type CORBA::Boolean continue_encoding = CORBA::B_TRUE; @@ -1146,7 +1149,7 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc, continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) value); break; case CORBA::tk_wchar: - continue_encoding = stream->put_wchar (*(wchar_t *) value); + continue_encoding = stream->put_wchar (*(CORBA::WChar *) value); break; case CORBA::tk_any: case CORBA::tk_TypeCode: @@ -1183,10 +1186,10 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc, // encode exception CORBA::TypeCode::traverse_status TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::Boolean continue_encoding = CORBA::B_TRUE; @@ -1202,80 +1205,80 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc, int member_count = tc->member_count (env); for (int i = 0; - i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE - && continue_encoding == CORBA::B_TRUE; - i++) - { - param = tc->member_type (i, env); - if (env.exception () == 0) - { - size = param->size (env); - if (env.exception () == 0) - { - alignment = param->alignment (env); - if (env.exception () == 0) - { - data = ptr_align_binary (data, alignment); - switch (param->kind_){ - case CORBA::tk_null: - case CORBA::tk_void: - break; - case CORBA::tk_short: - case CORBA::tk_ushort: - continue_encoding = stream->put_short (*(CORBA::Short *) data); - break; - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_enum: - continue_encoding = stream->put_long (*(CORBA::Long *) data); - break; - case CORBA::tk_double: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data); - break; - case CORBA::tk_boolean: - continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data); - break; - case CORBA::tk_char: - case CORBA::tk_octet: - continue_encoding = stream->put_char (*(CORBA::Char *) data); - break; - case CORBA::tk_longdouble: - continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data); - break; - case CORBA::tk_wchar: - continue_encoding = stream->put_wchar (*(wchar_t *) data); - break; - case CORBA::tk_any: - case CORBA::tk_TypeCode: - case CORBA::tk_Principal: - case CORBA::tk_objref: - case CORBA::tk_struct: - case CORBA::tk_union: - case CORBA::tk_string: - case CORBA::tk_sequence: - case CORBA::tk_array: - case CORBA::tk_alias: - case CORBA::tk_except: - case CORBA::tk_wstring: - retval = stream->encode (param, data, 0, env); - break; - default: - break; - } - data = (char *) data + size; - } - else - return CORBA::TypeCode::TRAVERSE_STOP; - } - else - return CORBA::TypeCode::TRAVERSE_STOP; - } - else - return CORBA::TypeCode::TRAVERSE_STOP; - } + i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE + && continue_encoding == CORBA::B_TRUE; + i++) + { + param = tc->member_type (i, env); + if (env.exception () == 0) + { + size = param->size (env); + if (env.exception () == 0) + { + alignment = param->alignment (env); + if (env.exception () == 0) + { + data = ptr_align_binary (data, alignment); + switch (param->kind_){ + case CORBA::tk_null: + case CORBA::tk_void: + break; + case CORBA::tk_short: + case CORBA::tk_ushort: + continue_encoding = stream->put_short (*(CORBA::Short *) data); + break; + case CORBA::tk_long: + case CORBA::tk_ulong: + case CORBA::tk_float: + case CORBA::tk_enum: + continue_encoding = stream->put_long (*(CORBA::Long *) data); + break; + case CORBA::tk_double: + case CORBA::tk_longlong: + case CORBA::tk_ulonglong: + continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data); + break; + case CORBA::tk_boolean: + continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data); + break; + case CORBA::tk_char: + case CORBA::tk_octet: + continue_encoding = stream->put_char (*(CORBA::Char *) data); + break; + case CORBA::tk_longdouble: + continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data); + break; + case CORBA::tk_wchar: + continue_encoding = stream->put_wchar (*(CORBA::WChar *) data); + break; + case CORBA::tk_any: + case CORBA::tk_TypeCode: + case CORBA::tk_Principal: + case CORBA::tk_objref: + case CORBA::tk_struct: + case CORBA::tk_union: + case CORBA::tk_string: + case CORBA::tk_sequence: + case CORBA::tk_array: + case CORBA::tk_alias: + case CORBA::tk_except: + case CORBA::tk_wstring: + retval = stream->encode (param, data, 0, env); + break; + default: + break; + } + data = (char *) data + size; + } + else + return CORBA::TypeCode::TRAVERSE_STOP; + } + else + return CORBA::TypeCode::TRAVERSE_STOP; + } + else + return CORBA::TypeCode::TRAVERSE_STOP; + } } else return CORBA::TypeCode::TRAVERSE_STOP; @@ -1295,10 +1298,10 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc, // encode wstring CORBA::TypeCode::traverse_status TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - void *context, - CORBA::Environment &env) + const void *data, + const void *, + void *context, + CORBA::Environment &env) { CORBA::Boolean continue_encoding = CORBA::B_TRUE; @@ -1322,7 +1325,7 @@ TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc, #if defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) CORBA::ULong len = wslen ((CORBA::WChar *) str); #else /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ - CORBA::ULong len = ACE_OS::strlen (str); + CORBA::ULong len = ACE_OS::strlen (str); #endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ // if it is an unbounded string or if the length is less than the @@ -1341,10 +1344,10 @@ TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc, return CORBA::TypeCode::TRAVERSE_CONTINUE; } else - return CORBA::TypeCode::TRAVERSE_STOP; + return CORBA::TypeCode::TRAVERSE_STOP; } else - return CORBA::TypeCode::TRAVERSE_STOP; + return CORBA::TypeCode::TRAVERSE_STOP; } else { diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp index 5af47ef5f4c..d7937bf8ef8 100644 --- a/TAO/tao/poa.cpp +++ b/TAO/tao/poa.cpp @@ -1078,7 +1078,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, PortableServer::Servant servant = 0; PortableServer::ObjectId id ((*iterator).ext_id_); - + int result = this->active_object_map ().unbind (id, servant); if (result != 0) { @@ -1086,7 +1086,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, env.exception (exception); return; } - + CORBA::Boolean remaining_activations = CORBA::B_FALSE; if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID && @@ -1490,7 +1490,7 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &oid, PortableServer::POA_var self = this->_this (env); if (env.exception () != 0) return; - + CORBA::Boolean remaining_activations = CORBA::B_FALSE; if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID && @@ -1851,7 +1851,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &oid, // activate the object is returned. PortableServer::Servant servant = 0; if (this->active_object_map ().find (oid, servant) != -1) - return this->create_reference_with_id (oid, + return this->create_reference_with_id (oid, servant->_interface_repository_id (), env); else @@ -2209,7 +2209,7 @@ TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key, // Setup for upcall poa->pre_invoke (key, id.in (), - servant, + servant, env); servant->_dispatch (req, @@ -2225,7 +2225,7 @@ TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key, void TAO_POA::pre_invoke (const TAO_ObjectKey &key, const PortableServer::ObjectId &id, - PortableServer::Servant servant, + PortableServer::Servant servant, CORBA::Environment &env) { ACE_UNUSED_ARG (env); @@ -2635,7 +2635,7 @@ TAO_POA::string_to_ObjectId (const char *id) } PortableServer::ObjectId * -TAO_POA::wstring_to_ObjectId (const wchar_t *id) +TAO_POA::wstring_to_ObjectId (const CORBA::WChar *id) { // Size of Id CORBA::ULong id_length = ACE_OS::strlen (id) + 1; @@ -2653,7 +2653,7 @@ TAO_POA::wstring_to_ObjectId (const wchar_t *id) CORBA::B_TRUE); } -wchar_t * +CORBA::WChar * TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id) { // This method assumes that the id was initially placed in the octet @@ -2666,7 +2666,7 @@ TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id) return CORBA::wstring_dup (id_buffer); } -const wchar_t * +const CORBA::WChar * TAO_POA::ObjectId_to_const_wstring (const PortableServer::ObjectId &id) { // This method assumes that the id was initially placed in the octet diff --git a/TAO/tao/poa.h b/TAO/tao/poa.h index 198760fb939..302c943b656 100644 --- a/TAO/tao/poa.h +++ b/TAO/tao/poa.h @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ // ============================================================================ // @@ -321,11 +322,11 @@ public: static char *ObjectId_to_string (const PortableServer::ObjectId &id); - static wchar_t *ObjectId_to_wstring (const PortableServer::ObjectId &id); + static CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id); static PortableServer::ObjectId *string_to_ObjectId (const char *id); - static PortableServer::ObjectId *wstring_to_ObjectId (const wchar_t *id); + static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); TAO_POA (const String &adapter_name, TAO_POA_Manager &poa_manager, @@ -508,7 +509,7 @@ protected: static const char *ObjectId_to_const_string (const PortableServer::ObjectId &id); - static const wchar_t *ObjectId_to_const_wstring (const PortableServer::ObjectId &id); + static const CORBA::WChar *ObjectId_to_const_wstring (const PortableServer::ObjectId &id); static const char *ObjectKey_to_const_string (const TAO_ObjectKey &key); diff --git a/TAO/tao/poaC.cpp b/TAO/tao/poaC.cpp index 0613457001f..32326180761 100644 --- a/TAO/tao/poaC.cpp +++ b/TAO/tao/poaC.cpp @@ -1,5 +1,7 @@ +// $Id$ +// // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO ORB and the TAO IDL Compiler have been developed by Washington +// TAO ORB and the TAO IDL Compiler have been developed by Washington // University Computer Science's Distributed Object Computing Group. // // Information on TAO is available at @@ -18,7 +20,7 @@ static const CORBA::Long _oc_PortableServer_Identifier[] = TAO_ENCAP_BYTE_ORDER, // byte order 34, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f49, 0x64656e74, 0x69666965, 0x723a312e, 0x30000000, // repository ID = IDL:PortableServer/Identifier:1.0 11, 0x4964656e, 0x74696669, 0x65720000, // name = Identifier - CORBA::tk_string, + CORBA::tk_string, 0, // string length }; static CORBA::TypeCode _tc__tc_PortableServer_Identifier (CORBA::tk_alias, sizeof (_oc_PortableServer_Identifier), (unsigned char *) &_oc_PortableServer_Identifier, CORBA::B_FALSE); @@ -29,7 +31,7 @@ static const CORBA::Long _oc_PortableServer_RepositoryId[] = TAO_ENCAP_BYTE_ORDER, // byte order 36, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f52, 0x65706f73, 0x69746f72, 0x7949643a, 0x312e3000, // repository ID = IDL:PortableServer/RepositoryId:1.0 13, 0x5265706f, 0x7369746f, 0x72794964, 0x0, // name = RepositoryId - CORBA::tk_string, + CORBA::tk_string, 0, // string length }; static CORBA::TypeCode _tc__tc_PortableServer_RepositoryId (CORBA::tk_alias, sizeof (_oc_PortableServer_RepositoryId), (unsigned char *) &_oc_PortableServer_RepositoryId, CORBA::B_FALSE); @@ -39,7 +41,7 @@ PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_duplicate (Portabl { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -55,10 +57,10 @@ PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::CurrentBase_ptr new_obj; // to be returned + PortableServer::CurrentBase_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::CurrentBase::_nil (); - + new_obj = new PortableServer::CurrentBase (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -81,14 +83,14 @@ PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_bind (const char * // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::CurrentBase::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::CurrentBase::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::CurrentBase::_nil (); + return PortableServer::CurrentBase::_nil (); else // narrow it - return PortableServer::CurrentBase::_narrow (objref, env); + return PortableServer::CurrentBase::_narrow (objref, env); } CORBA::Boolean PortableServer::CurrentBase::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -96,9 +98,9 @@ CORBA::Boolean PortableServer::CurrentBase::_is_a (const CORBA::Char *value, COR if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_CurrentBase[] = @@ -114,7 +116,7 @@ PortableServer::Policy_ptr PortableServer::Policy::_duplicate (PortableServer::P { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -130,10 +132,10 @@ PortableServer::Policy_ptr PortableServer::Policy::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::Policy_ptr new_obj; // to be returned + PortableServer::Policy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::Policy::_nil (); - + new_obj = new PortableServer::Policy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -156,22 +158,22 @@ PortableServer::Policy_ptr PortableServer::Policy::_bind (const char *host, CORB // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::Policy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::Policy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::Policy::_nil (); + return PortableServer::Policy::_nil (); else // narrow it - return PortableServer::Policy::_narrow (objref, env); + return PortableServer::Policy::_narrow (objref, env); } -static const TAO_Param_Data PortableServer_Policy_copy_paramdata [] = +static const TAO_Param_Data PortableServer_Policy_copy_paramdata [] = { {PortableServer::_tc_Policy, PARAM_RETURN, 0} }; -static const TAO_Call_Data PortableServer_Policy_copy_calldata = +static const TAO_Call_Data PortableServer_Policy_copy_calldata = {"copy", 1, 1, PortableServer_Policy_copy_paramdata, 0, 0}; PortableServer::Policy_ptr PortableServer::Policy::copy (CORBA::Environment &env) @@ -187,15 +189,15 @@ PortableServer::Policy_ptr PortableServer::Policy::copy (CORBA::Environment &en this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_Policy_copy_calldata, &retval); return PortableServer::Policy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_Policy_destroy_paramdata [] = +static const TAO_Param_Data PortableServer_Policy_destroy_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0} }; -static const TAO_Call_Data PortableServer_Policy_destroy_calldata = +static const TAO_Call_Data PortableServer_Policy_destroy_calldata = {"destroy", 1, 1, PortableServer_Policy_destroy_paramdata, 0, 0}; void PortableServer::Policy::destroy (CORBA::Environment &env) @@ -210,7 +212,7 @@ void PortableServer::Policy::destroy (CORBA::Environment &env) this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_Policy_destroy_calldata, 0); return; // no value - + } CORBA::Boolean PortableServer::Policy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -218,9 +220,9 @@ CORBA::Boolean PortableServer::Policy::_is_a (const CORBA::Char *value, CORBA::E if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_Policy[] = @@ -304,7 +306,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ObjectId = &_tc__tc_PortableServer_Objec // copy constructor PortableServer::ForwardRequest::ForwardRequest(const PortableServer::ForwardRequest &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { this->forward_reference = _tao_excp.forward_reference; } @@ -320,19 +322,19 @@ PortableServer::ForwardRequest::operator= (const PortableServer::ForwardRequest // special constructor PortableServer::ForwardRequest::ForwardRequest(const CORBA::Object_ptr &_tao_forward_reference) - : CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::_tc_ForwardRequest)) + : CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::_tc_ForwardRequest)) { this->forward_reference = _tao_forward_reference; } // narrow -PortableServer::ForwardRequest_ptr +PortableServer::ForwardRequest_ptr PortableServer::ForwardRequest::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/ForwardRequest:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc); + return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_ForwardRequest[] = @@ -363,7 +365,7 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (Porta { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -379,10 +381,10 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::ThreadPolicy_ptr new_obj; // to be returned + PortableServer::ThreadPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::ThreadPolicy::_nil (); - + new_obj = new PortableServer::ThreadPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -405,21 +407,21 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_bind (const char // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::ThreadPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::ThreadPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::ThreadPolicy::_nil (); + return PortableServer::ThreadPolicy::_nil (); else // narrow it - return PortableServer::ThreadPolicy::_narrow (objref, env); + return PortableServer::ThreadPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] = { {PortableServer::_tc_ThreadPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata, 0, 0}; PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &env) @@ -435,7 +437,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_ThreadPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -444,9 +446,9 @@ CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CO (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ThreadPolicy[] = @@ -475,7 +477,7 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (P { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -491,10 +493,10 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::LifespanPolicy_ptr new_obj; // to be returned + PortableServer::LifespanPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::LifespanPolicy::_nil (); - + new_obj = new PortableServer::LifespanPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -517,21 +519,21 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_bind (const // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::LifespanPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::LifespanPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::LifespanPolicy::_nil (); + return PortableServer::LifespanPolicy::_nil (); else // narrow it - return PortableServer::LifespanPolicy::_narrow (objref, env); + return PortableServer::LifespanPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] = { {PortableServer::_tc_LifespanPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata, 0, 0}; PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &env) @@ -547,7 +549,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_LifespanPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -556,9 +558,9 @@ CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_LifespanPolicy[] = @@ -587,7 +589,7 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_dupl { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -603,10 +605,10 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::IdUniquenessPolicy_ptr new_obj; // to be returned + PortableServer::IdUniquenessPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::IdUniquenessPolicy::_nil (); - + new_obj = new PortableServer::IdUniquenessPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -629,21 +631,21 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_bind // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::IdUniquenessPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::IdUniquenessPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::IdUniquenessPolicy::_nil (); + return PortableServer::IdUniquenessPolicy::_nil (); else // narrow it - return PortableServer::IdUniquenessPolicy::_narrow (objref, env); + return PortableServer::IdUniquenessPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] = { {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata, 0, 0}; PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &env) @@ -659,7 +661,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_IdUniquenessPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -668,9 +670,9 @@ CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *val (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] = @@ -699,7 +701,7 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_dupl { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -715,10 +717,10 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::IdAssignmentPolicy_ptr new_obj; // to be returned + PortableServer::IdAssignmentPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::IdAssignmentPolicy::_nil (); - + new_obj = new PortableServer::IdAssignmentPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -741,21 +743,21 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_bind // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::IdAssignmentPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::IdAssignmentPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::IdAssignmentPolicy::_nil (); + return PortableServer::IdAssignmentPolicy::_nil (); else // narrow it - return PortableServer::IdAssignmentPolicy::_narrow (objref, env); + return PortableServer::IdAssignmentPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] = { {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata, 0, 0}; PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &env) @@ -771,7 +773,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_IdAssignmentPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -780,9 +782,9 @@ CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *val (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] = @@ -811,7 +813,7 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -827,10 +829,10 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::ImplicitActivationPolicy_ptr new_obj; // to be returned + PortableServer::ImplicitActivationPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::ImplicitActivationPolicy::_nil (); - + new_obj = new PortableServer::ImplicitActivationPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -853,21 +855,21 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::ImplicitActivationPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::ImplicitActivationPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::ImplicitActivationPolicy::_nil (); + return PortableServer::ImplicitActivationPolicy::_nil (); else // narrow it - return PortableServer::ImplicitActivationPolicy::_narrow (objref, env); + return PortableServer::ImplicitActivationPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] = { {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata, 0, 0}; PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &env) @@ -883,7 +885,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_ImplicitActivationPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -892,9 +894,9 @@ CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Cha (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] = @@ -923,7 +925,7 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -939,10 +941,10 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::ServantRetentionPolicy_ptr new_obj; // to be returned + PortableServer::ServantRetentionPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::ServantRetentionPolicy::_nil (); - + new_obj = new PortableServer::ServantRetentionPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -965,21 +967,21 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::ServantRetentionPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::ServantRetentionPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::ServantRetentionPolicy::_nil (); + return PortableServer::ServantRetentionPolicy::_nil (); else // narrow it - return PortableServer::ServantRetentionPolicy::_narrow (objref, env); + return PortableServer::ServantRetentionPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] = { {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata, 0, 0}; PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &env) @@ -995,7 +997,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_ServantRetentionPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -1004,9 +1006,9 @@ CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] = @@ -1036,7 +1038,7 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1052,10 +1054,10 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::RequestProcessingPolicy_ptr new_obj; // to be returned + PortableServer::RequestProcessingPolicy_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::RequestProcessingPolicy::_nil (); - + new_obj = new PortableServer::RequestProcessingPolicy (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1078,21 +1080,21 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::RequestProcessingPolicy::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::RequestProcessingPolicy::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::RequestProcessingPolicy::_nil (); + return PortableServer::RequestProcessingPolicy::_nil (); else // narrow it - return PortableServer::RequestProcessingPolicy::_narrow (objref, env); + return PortableServer::RequestProcessingPolicy::_narrow (objref, env); } -static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] = +static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] = { {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata = +static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata = {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata, 0, 0}; PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &env) @@ -1108,7 +1110,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_RequestProcessingPolicy_value_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -1117,9 +1119,9 @@ CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] = @@ -1135,7 +1137,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableS { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1151,10 +1153,10 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::POAManager_ptr new_obj; // to be returned + PortableServer::POAManager_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::POAManager::_nil (); - + new_obj = new PortableServer::POAManager (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1177,19 +1179,19 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_bind (const char *ho // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::POAManager::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::POAManager::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::POAManager::_nil (); + return PortableServer::POAManager::_nil (); else // narrow it - return PortableServer::POAManager::_narrow (objref, env); + return PortableServer::POAManager::_narrow (objref, env); } // copy constructor PortableServer::POAManager::AdapterInactive::AdapterInactive(const PortableServer::POAManager::AdapterInactive &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1202,13 +1204,13 @@ PortableServer::POAManager::AdapterInactive::operator= (const PortableServer::PO } // narrow -PortableServer::POAManager::AdapterInactive_ptr +PortableServer::POAManager::AdapterInactive_ptr PortableServer::POAManager::AdapterInactive::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POAManager/AdapterInactive:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc); + return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] = @@ -1221,12 +1223,12 @@ static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] = static CORBA::TypeCode _tc__tc_PortableServer_POAManager_AdapterInactive (CORBA::tk_struct, sizeof (_oc_PortableServer_POAManager_AdapterInactive), (unsigned char *) &_oc_PortableServer_POAManager_AdapterInactive, CORBA::B_FALSE); CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc__tc_PortableServer_POAManager_AdapterInactive; -static const TAO_Param_Data PortableServer_POAManager_activate_paramdata [] = +static const TAO_Param_Data PortableServer_POAManager_activate_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0} }; -static const TAO_Call_Data PortableServer_POAManager_activate_calldata = +static const TAO_Call_Data PortableServer_POAManager_activate_calldata = {"activate", 1, 1, PortableServer_POAManager_activate_paramdata, 0, 0}; void PortableServer::POAManager::activate (CORBA::Environment &env) @@ -1241,16 +1243,16 @@ void PortableServer::POAManager::activate (CORBA::Environment &env) this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POAManager_activate_calldata, 0); return; // no value - + } -static const TAO_Param_Data PortableServer_POAManager_hold_requests_paramdata [] = +static const TAO_Param_Data PortableServer_POAManager_hold_requests_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POAManager_hold_requests_calldata = +static const TAO_Call_Data PortableServer_POAManager_hold_requests_calldata = {"hold_requests", 1, 2, PortableServer_POAManager_hold_requests_paramdata, 0, 0}; void PortableServer::POAManager::hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) @@ -1265,16 +1267,16 @@ void PortableServer::POAManager::hold_requests (CORBA::Boolean wait_for_complet this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POAManager_hold_requests_calldata, 0, &wait_for_completion); return; // no value - + } -static const TAO_Param_Data PortableServer_POAManager_discard_requests_paramdata [] = +static const TAO_Param_Data PortableServer_POAManager_discard_requests_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POAManager_discard_requests_calldata = +static const TAO_Call_Data PortableServer_POAManager_discard_requests_calldata = {"discard_requests", 1, 2, PortableServer_POAManager_discard_requests_paramdata, 0, 0}; void PortableServer::POAManager::discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) @@ -1289,17 +1291,17 @@ void PortableServer::POAManager::discard_requests (CORBA::Boolean wait_for_comp this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POAManager_discard_requests_calldata, 0, &wait_for_completion); return; // no value - + } -static const TAO_Param_Data PortableServer_POAManager_deactivate_paramdata [] = +static const TAO_Param_Data PortableServer_POAManager_deactivate_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POAManager_deactivate_calldata = +static const TAO_Call_Data PortableServer_POAManager_deactivate_calldata = {"deactivate", 1, 3, PortableServer_POAManager_deactivate_paramdata, 0, 0}; void PortableServer::POAManager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) @@ -1314,7 +1316,7 @@ void PortableServer::POAManager::deactivate (CORBA::Boolean etherealize_objects this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POAManager_deactivate_calldata, 0, ðerealize_objects, &wait_for_completion); return; // no value - + } CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -1322,9 +1324,9 @@ CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORB if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_POAManager[] = @@ -1340,7 +1342,7 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicat { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1356,10 +1358,10 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::AdapterActivator_ptr new_obj; // to be returned + PortableServer::AdapterActivator_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::AdapterActivator::_nil (); - + new_obj = new PortableServer::AdapterActivator (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1382,24 +1384,24 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_bind (co // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::AdapterActivator::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::AdapterActivator::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::AdapterActivator::_nil (); + return PortableServer::AdapterActivator::_nil (); else // narrow it - return PortableServer::AdapterActivator::_narrow (objref, env); + return PortableServer::AdapterActivator::_narrow (objref, env); } -static const TAO_Param_Data PortableServer_AdapterActivator_unknown_adapter_paramdata [] = +static const TAO_Param_Data PortableServer_AdapterActivator_unknown_adapter_paramdata [] = { {CORBA::_tc_boolean, PARAM_RETURN, 0}, {PortableServer::_tc_POA, PARAM_IN, 0}, {CORBA::_tc_string, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_AdapterActivator_unknown_adapter_calldata = +static const TAO_Call_Data PortableServer_AdapterActivator_unknown_adapter_calldata = {"unknown_adapter", 1, 3, PortableServer_AdapterActivator_unknown_adapter_paramdata, 0, 0}; CORBA::Boolean PortableServer::AdapterActivator::unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA::Environment &env) @@ -1416,7 +1418,7 @@ CORBA::Boolean PortableServer::AdapterActivator::unknown_adapter (PortableServe CORBA::Object_ptr _tao_base_parent = parent; // cast it istub->do_call (env, &PortableServer_AdapterActivator_unknown_adapter_calldata, &retval, &_tao_base_parent, &name); return retval; - + } CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -1424,9 +1426,9 @@ CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_AdapterActivator[] = @@ -1442,7 +1444,7 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (P { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1458,10 +1460,10 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::ServantManager_ptr new_obj; // to be returned + PortableServer::ServantManager_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::ServantManager::_nil (); - + new_obj = new PortableServer::ServantManager (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1484,14 +1486,14 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_bind (const // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::ServantManager::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::ServantManager::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::ServantManager::_nil (); + return PortableServer::ServantManager::_nil (); else // narrow it - return PortableServer::ServantManager::_narrow (objref, env); + return PortableServer::ServantManager::_narrow (objref, env); } CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -1499,9 +1501,9 @@ CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantManager[] = @@ -1517,7 +1519,7 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicat { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1533,10 +1535,10 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::ServantActivator_ptr new_obj; // to be returned + PortableServer::ServantActivator_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::ServantActivator::_nil (); - + new_obj = new PortableServer::ServantActivator (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1559,14 +1561,14 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_bind (co // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::ServantActivator::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::ServantActivator::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::ServantActivator::_nil (); + return PortableServer::ServantActivator::_nil (); else // narrow it - return PortableServer::ServantActivator::_narrow (objref, env); + return PortableServer::ServantActivator::_narrow (objref, env); } PortableServer::Servant PortableServer::ServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA::Environment &env) @@ -1589,9 +1591,9 @@ CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantActivator[] = @@ -1607,7 +1609,7 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (P { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1623,10 +1625,10 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::ServantLocator_ptr new_obj; // to be returned + PortableServer::ServantLocator_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::ServantLocator::_nil (); - + new_obj = new PortableServer::ServantLocator (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1649,14 +1651,14 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_bind (const // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::ServantLocator::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::ServantLocator::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::ServantLocator::_nil (); + return PortableServer::ServantLocator::_nil (); else // narrow it - return PortableServer::ServantLocator::_narrow (objref, env); + return PortableServer::ServantLocator::_narrow (objref, env); } PortableServer::Servant PortableServer::ServantLocator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie, CORBA::Environment &env) @@ -1679,9 +1681,9 @@ CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantLocator[] = @@ -1697,7 +1699,7 @@ PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -1713,10 +1715,10 @@ PortableServer::POA_ptr PortableServer::POA::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::POA_ptr new_obj; // to be returned + PortableServer::POA_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::POA::_nil (); - + new_obj = new PortableServer::POA (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -1739,19 +1741,19 @@ PortableServer::POA_ptr PortableServer::POA::_bind (const char *host, CORBA::USh // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::POA::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::POA::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::POA::_nil (); + return PortableServer::POA::_nil (); else // narrow it - return PortableServer::POA::_narrow (objref, env); + return PortableServer::POA::_narrow (objref, env); } // copy constructor PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists(const PortableServer::POA::AdapterAlreadyExists &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1764,13 +1766,13 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const PortableServer::POA: } // narrow -PortableServer::POA::AdapterAlreadyExists_ptr +PortableServer::POA::AdapterAlreadyExists_ptr PortableServer::POA::AdapterAlreadyExists::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::AdapterAlreadyExists_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::AdapterAlreadyExists_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] = @@ -1785,7 +1787,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc__tc_Por // copy constructor PortableServer::POA::AdapterInactive::AdapterInactive(const PortableServer::POA::AdapterInactive &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1798,13 +1800,13 @@ PortableServer::POA::AdapterInactive::operator= (const PortableServer::POA::Adap } // narrow -PortableServer::POA::AdapterInactive_ptr +PortableServer::POA::AdapterInactive_ptr PortableServer::POA::AdapterInactive::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterInactive:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_AdapterInactive[] = @@ -1819,7 +1821,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterInactive = &_tc__tc_Portable // copy constructor PortableServer::POA::AdapterNonExistent::AdapterNonExistent(const PortableServer::POA::AdapterNonExistent &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1832,13 +1834,13 @@ PortableServer::POA::AdapterNonExistent::operator= (const PortableServer::POA::A } // narrow -PortableServer::POA::AdapterNonExistent_ptr +PortableServer::POA::AdapterNonExistent_ptr PortableServer::POA::AdapterNonExistent::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterNonExistent:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] = @@ -1853,7 +1855,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = &_tc__tc_Porta // copy constructor PortableServer::POA::InvalidPolicy::InvalidPolicy(const PortableServer::POA::InvalidPolicy &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { this->index = _tao_excp.index; } @@ -1869,19 +1871,19 @@ PortableServer::POA::InvalidPolicy::operator= (const PortableServer::POA::Invali // special constructor PortableServer::POA::InvalidPolicy::InvalidPolicy(const CORBA::UShort _tao_index) - : CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_InvalidPolicy)) + : CORBA_UserException (CORBA::TypeCode::_duplicate (PortableServer::POA::_tc_InvalidPolicy)) { this->index = _tao_index; } // narrow -PortableServer::POA::InvalidPolicy_ptr +PortableServer::POA::InvalidPolicy_ptr PortableServer::POA::InvalidPolicy::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/InvalidPolicy:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] = @@ -1899,7 +1901,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = &_tc__tc_PortableSe // copy constructor PortableServer::POA::NoServant::NoServant(const PortableServer::POA::NoServant &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1912,13 +1914,13 @@ PortableServer::POA::NoServant::operator= (const PortableServer::POA::NoServant } // narrow -PortableServer::POA::NoServant_ptr +PortableServer::POA::NoServant_ptr PortableServer::POA::NoServant::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/NoServant:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_NoServant[] = @@ -1933,7 +1935,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant = &_tc__tc_PortableServer // copy constructor PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive(const PortableServer::POA::ObjectAlreadyActive &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1946,13 +1948,13 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const PortableServer::POA:: } // narrow -PortableServer::POA::ObjectAlreadyActive_ptr +PortableServer::POA::ObjectAlreadyActive_ptr PortableServer::POA::ObjectAlreadyActive::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] = @@ -1967,7 +1969,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc__tc_Port // copy constructor PortableServer::POA::ObjectNotActive::ObjectNotActive(const PortableServer::POA::ObjectNotActive &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -1980,13 +1982,13 @@ PortableServer::POA::ObjectNotActive::operator= (const PortableServer::POA::Obje } // narrow -PortableServer::POA::ObjectNotActive_ptr +PortableServer::POA::ObjectNotActive_ptr PortableServer::POA::ObjectNotActive::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectNotActive:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] = @@ -2001,7 +2003,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = &_tc__tc_Portable // copy constructor PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive(const PortableServer::POA::ServantAlreadyActive &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -2014,13 +2016,13 @@ PortableServer::POA::ServantAlreadyActive::operator= (const PortableServer::POA: } // narrow -PortableServer::POA::ServantAlreadyActive_ptr +PortableServer::POA::ServantAlreadyActive_ptr PortableServer::POA::ServantAlreadyActive::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantAlreadyActive:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] = @@ -2035,7 +2037,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc__tc_Por // copy constructor PortableServer::POA::ServantNotActive::ServantNotActive(const PortableServer::POA::ServantNotActive &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -2048,13 +2050,13 @@ PortableServer::POA::ServantNotActive::operator= (const PortableServer::POA::Ser } // narrow -PortableServer::POA::ServantNotActive_ptr +PortableServer::POA::ServantNotActive_ptr PortableServer::POA::ServantNotActive::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantNotActive:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] = @@ -2069,7 +2071,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = &_tc__tc_Portabl // copy constructor PortableServer::POA::WrongAdapter::WrongAdapter(const PortableServer::POA::WrongAdapter &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -2082,13 +2084,13 @@ PortableServer::POA::WrongAdapter::operator= (const PortableServer::POA::WrongAd } // narrow -PortableServer::POA::WrongAdapter_ptr +PortableServer::POA::WrongAdapter_ptr PortableServer::POA::WrongAdapter::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongAdapter:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] = @@ -2103,7 +2105,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = &_tc__tc_PortableSer // copy constructor PortableServer::POA::WrongPolicy::WrongPolicy(const PortableServer::POA::WrongPolicy &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -2116,13 +2118,13 @@ PortableServer::POA::WrongPolicy::operator= (const PortableServer::POA::WrongPol } // narrow -PortableServer::POA::WrongPolicy_ptr +PortableServer::POA::WrongPolicy_ptr PortableServer::POA::WrongPolicy::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongPolicy:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc); + return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] = @@ -2135,7 +2137,7 @@ static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] = static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongPolicy (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_WrongPolicy), (unsigned char *) &_oc_PortableServer_POA_WrongPolicy, CORBA::B_FALSE); CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc__tc_PortableServer_POA_WrongPolicy; -static const TAO_Param_Data PortableServer_POA_create_POA_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_POA_paramdata [] = { {PortableServer::_tc_POA, PARAM_RETURN, 0}, {CORBA::_tc_string, PARAM_IN, 0}, @@ -2143,7 +2145,7 @@ static const TAO_Param_Data PortableServer_POA_create_POA_paramdata [] = {PortableServer::_tc_PolicyList, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_POA_calldata = +static const TAO_Call_Data PortableServer_POA_create_POA_calldata = {"create_POA", 1, 4, PortableServer_POA_create_POA_paramdata, 0, 0}; PortableServer::POA_ptr PortableServer::POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const PortableServer::PolicyList &policies, CORBA::Environment &env) @@ -2160,17 +2162,17 @@ PortableServer::POA_ptr PortableServer::POA::create_POA (const char *adapter_na CORBA::Object_ptr _tao_base_a_POAManager = a_POAManager; // cast it istub->do_call (env, &PortableServer_POA_create_POA_calldata, &retval, &adapter_name, &_tao_base_a_POAManager, &policies); return PortableServer::POA::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_find_POA_paramdata [] = +static const TAO_Param_Data PortableServer_POA_find_POA_paramdata [] = { {PortableServer::_tc_POA, PARAM_RETURN, 0}, {CORBA::_tc_string, PARAM_IN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_find_POA_calldata = +static const TAO_Call_Data PortableServer_POA_find_POA_calldata = {"find_POA", 1, 3, PortableServer_POA_find_POA_paramdata, 0, 0}; PortableServer::POA_ptr PortableServer::POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env) @@ -2186,17 +2188,17 @@ PortableServer::POA_ptr PortableServer::POA::find_POA (const char *adapter_name this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_find_POA_calldata, &retval, &adapter_name, &activate_it); return PortableServer::POA::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_destroy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_destroy_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0}, {CORBA::_tc_boolean, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_destroy_calldata = +static const TAO_Call_Data PortableServer_POA_destroy_calldata = {"destroy", 1, 3, PortableServer_POA_destroy_paramdata, 0, 0}; void PortableServer::POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) @@ -2211,16 +2213,16 @@ void PortableServer::POA::destroy (CORBA::Boolean etherealize_objects, CORBA::B this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_destroy_calldata, 0, ðerealize_objects, &wait_for_completion); return; // no value - + } -static const TAO_Param_Data PortableServer_POA_create_thread_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_thread_policy_paramdata [] = { {PortableServer::_tc_ThreadPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_ThreadPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_thread_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_thread_policy_calldata = {"create_thread_policy", 1, 2, PortableServer_POA_create_thread_policy_paramdata, 0, 0}; PortableServer::ThreadPolicy_ptr PortableServer::POA::create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA::Environment &env) @@ -2236,16 +2238,16 @@ PortableServer::ThreadPolicy_ptr PortableServer::POA::create_thread_policy (Por this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_thread_policy_calldata, &retval, &value); return PortableServer::ThreadPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_create_lifespan_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_lifespan_policy_paramdata [] = { {PortableServer::_tc_LifespanPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_LifespanPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_lifespan_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_lifespan_policy_calldata = {"create_lifespan_policy", 1, 2, PortableServer_POA_create_lifespan_policy_paramdata, 0, 0}; PortableServer::LifespanPolicy_ptr PortableServer::POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA::Environment &env) @@ -2261,16 +2263,16 @@ PortableServer::LifespanPolicy_ptr PortableServer::POA::create_lifespan_policy this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_lifespan_policy_calldata, &retval, &value); return PortableServer::LifespanPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_create_id_uniqueness_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_id_uniqueness_policy_paramdata [] = { {PortableServer::_tc_IdUniquenessPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_id_uniqueness_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_id_uniqueness_policy_calldata = {"create_id_uniqueness_policy", 1, 2, PortableServer_POA_create_id_uniqueness_policy_paramdata, 0, 0}; PortableServer::IdUniquenessPolicy_ptr PortableServer::POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA::Environment &env) @@ -2286,16 +2288,16 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::POA::create_id_uniquenes this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_id_uniqueness_policy_calldata, &retval, &value); return PortableServer::IdUniquenessPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_create_id_assignment_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_id_assignment_policy_paramdata [] = { {PortableServer::_tc_IdAssignmentPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_id_assignment_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_id_assignment_policy_calldata = {"create_id_assignment_policy", 1, 2, PortableServer_POA_create_id_assignment_policy_paramdata, 0, 0}; PortableServer::IdAssignmentPolicy_ptr PortableServer::POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA::Environment &env) @@ -2311,16 +2313,16 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::POA::create_id_assignmen this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_id_assignment_policy_calldata, &retval, &value); return PortableServer::IdAssignmentPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_create_implicit_activation_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_implicit_activation_policy_paramdata [] = { {PortableServer::_tc_ImplicitActivationPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_implicit_activation_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_implicit_activation_policy_calldata = {"create_implicit_activation_policy", 1, 2, PortableServer_POA_create_implicit_activation_policy_paramdata, 0, 0}; PortableServer::ImplicitActivationPolicy_ptr PortableServer::POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA::Environment &env) @@ -2336,16 +2338,16 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::POA::create_implic this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_implicit_activation_policy_calldata, &retval, &value); return PortableServer::ImplicitActivationPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_create_servant_retention_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_servant_retention_policy_paramdata [] = { {PortableServer::_tc_ServantRetentionPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_servant_retention_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_servant_retention_policy_calldata = {"create_servant_retention_policy", 1, 2, PortableServer_POA_create_servant_retention_policy_paramdata, 0, 0}; PortableServer::ServantRetentionPolicy_ptr PortableServer::POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA::Environment &env) @@ -2361,16 +2363,16 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::POA::create_servant_ this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_servant_retention_policy_calldata, &retval, &value); return PortableServer::ServantRetentionPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_create_request_processing_policy_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_request_processing_policy_paramdata [] = { {PortableServer::_tc_RequestProcessingPolicy, PARAM_RETURN, 0}, {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_request_processing_policy_calldata = +static const TAO_Call_Data PortableServer_POA_create_request_processing_policy_calldata = {"create_request_processing_policy", 1, 2, PortableServer_POA_create_request_processing_policy_paramdata, 0, 0}; PortableServer::RequestProcessingPolicy_ptr PortableServer::POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA::Environment &env) @@ -2386,14 +2388,14 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::POA::create_request this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_request_processing_policy_calldata, &retval, &value); return PortableServer::RequestProcessingPolicy::_narrow (retval, env); - + } -static const TAO_Param_Data _get_PortableServer_POA_the_name_paramdata [] = +static const TAO_Param_Data _get_PortableServer_POA_the_name_paramdata [] = { {CORBA::_tc_string, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_POA_the_name_calldata = +static const TAO_Call_Data _get_PortableServer_POA_the_name_calldata = {"_get_the_name", 1, 1, _get_PortableServer_POA_the_name_paramdata, 0, 0}; char * PortableServer::POA::the_name(CORBA::Environment &env) @@ -2409,14 +2411,14 @@ char * PortableServer::POA::the_name(CORBA::Environment &env) this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_POA_the_name_calldata, &retval); return retval; - + } -static const TAO_Param_Data _get_PortableServer_POA_the_parent_paramdata [] = +static const TAO_Param_Data _get_PortableServer_POA_the_parent_paramdata [] = { {PortableServer::_tc_POA, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_POA_the_parent_calldata = +static const TAO_Call_Data _get_PortableServer_POA_the_parent_calldata = {"_get_the_parent", 1, 1, _get_PortableServer_POA_the_parent_paramdata, 0, 0}; PortableServer::POA_ptr PortableServer::POA::the_parent(CORBA::Environment &env) @@ -2432,14 +2434,14 @@ PortableServer::POA_ptr PortableServer::POA::the_parent(CORBA::Environment &env this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_POA_the_parent_calldata, &retval); return PortableServer::POA::_narrow (retval, env); - + } -static const TAO_Param_Data _get_PortableServer_POA_the_POAManager_paramdata [] = +static const TAO_Param_Data _get_PortableServer_POA_the_POAManager_paramdata [] = { {PortableServer::_tc_POAManager, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_POA_the_POAManager_calldata = +static const TAO_Call_Data _get_PortableServer_POA_the_POAManager_calldata = {"_get_the_POAManager", 1, 1, _get_PortableServer_POA_the_POAManager_paramdata, 0, 0}; PortableServer::POAManager_ptr PortableServer::POA::the_POAManager(CORBA::Environment &env) @@ -2455,14 +2457,14 @@ PortableServer::POAManager_ptr PortableServer::POA::the_POAManager(CORBA::Envir this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_POA_the_POAManager_calldata, &retval); return PortableServer::POAManager::_narrow (retval, env); - + } -static const TAO_Param_Data _get_PortableServer_POA_the_activator_paramdata [] = +static const TAO_Param_Data _get_PortableServer_POA_the_activator_paramdata [] = { {PortableServer::_tc_AdapterActivator, PARAM_RETURN, 0}}; -static const TAO_Call_Data _get_PortableServer_POA_the_activator_calldata = +static const TAO_Call_Data _get_PortableServer_POA_the_activator_calldata = {"_get_the_activator", 1, 1, _get_PortableServer_POA_the_activator_paramdata, 0, 0}; PortableServer::AdapterActivator_ptr PortableServer::POA::the_activator(CORBA::Environment &env) @@ -2478,16 +2480,16 @@ PortableServer::AdapterActivator_ptr PortableServer::POA::the_activator(CORBA:: this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &_get_PortableServer_POA_the_activator_calldata, &retval); return PortableServer::AdapterActivator::_narrow (retval, env); - + } -static const TAO_Param_Data _set_PortableServer_POA_the_activator_paramdata [] = +static const TAO_Param_Data _set_PortableServer_POA_the_activator_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {PortableServer::_tc_AdapterActivator, PARAM_IN, 0} }; -static const TAO_Call_Data _set_PortableServer_POA_the_activator_calldata = +static const TAO_Call_Data _set_PortableServer_POA_the_activator_calldata = {"_set_the_activator", 1, 2, _set_PortableServer_POA_the_activator_paramdata, 0, 0}; void PortableServer::POA::the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA::Environment &env) @@ -2502,15 +2504,15 @@ void PortableServer::POA::the_activator(PortableServer::AdapterActivator_ptr the this->Release (); // QueryInterface has bumped up our refcount CORBA::Object_ptr _tao_base_the_activator = the_activator; // cast it istub->do_call (env, &_set_PortableServer_POA_the_activator_calldata, 0, &_tao_base_the_activator); - + } -static const TAO_Param_Data PortableServer_POA_get_servant_manager_paramdata [] = +static const TAO_Param_Data PortableServer_POA_get_servant_manager_paramdata [] = { {PortableServer::_tc_ServantManager, PARAM_RETURN, 0} }; -static const TAO_Call_Data PortableServer_POA_get_servant_manager_calldata = +static const TAO_Call_Data PortableServer_POA_get_servant_manager_calldata = {"get_servant_manager", 1, 1, PortableServer_POA_get_servant_manager_paramdata, 0, 0}; PortableServer::ServantManager_ptr PortableServer::POA::get_servant_manager (CORBA::Environment &env) @@ -2526,16 +2528,16 @@ PortableServer::ServantManager_ptr PortableServer::POA::get_servant_manager (CO this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_get_servant_manager_calldata, &retval); return PortableServer::ServantManager::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_POA_set_servant_manager_paramdata [] = +static const TAO_Param_Data PortableServer_POA_set_servant_manager_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {PortableServer::_tc_ServantManager, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_set_servant_manager_calldata = +static const TAO_Call_Data PortableServer_POA_set_servant_manager_calldata = {"set_servant_manager", 1, 2, PortableServer_POA_set_servant_manager_paramdata, 0, 0}; void PortableServer::POA::set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA::Environment &env) @@ -2551,7 +2553,7 @@ void PortableServer::POA::set_servant_manager (PortableServer::ServantManager_p CORBA::Object_ptr _tao_base_imgr = imgr; // cast it istub->do_call (env, &PortableServer_POA_set_servant_manager_calldata, 0, &_tao_base_imgr); return; // no value - + } PortableServer::Servant PortableServer::POA::get_servant (CORBA::Environment &env) @@ -2582,13 +2584,13 @@ void PortableServer::POA::activate_object_with_id (const PortableServer::Object } -static const TAO_Param_Data PortableServer_POA_deactivate_object_paramdata [] = +static const TAO_Param_Data PortableServer_POA_deactivate_object_paramdata [] = { {CORBA::_tc_void, PARAM_RETURN, 0}, {PortableServer::_tc_ObjectId, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_deactivate_object_calldata = +static const TAO_Call_Data PortableServer_POA_deactivate_object_calldata = {"deactivate_object", 1, 2, PortableServer_POA_deactivate_object_paramdata, 0, 0}; void PortableServer::POA::deactivate_object (const PortableServer::ObjectId &oid, CORBA::Environment &env) @@ -2603,16 +2605,16 @@ void PortableServer::POA::deactivate_object (const PortableServer::ObjectId &oi this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_deactivate_object_calldata, 0, &oid); return; // no value - + } -static const TAO_Param_Data PortableServer_POA_create_reference_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_reference_paramdata [] = { {CORBA::_tc_Object, PARAM_RETURN, 0}, {PortableServer::_tc_RepositoryId, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_reference_calldata = +static const TAO_Call_Data PortableServer_POA_create_reference_calldata = {"create_reference", 1, 2, PortableServer_POA_create_reference_paramdata, 0, 0}; CORBA::Object_ptr PortableServer::POA::create_reference (const char *intf, CORBA::Environment &env) @@ -2628,17 +2630,17 @@ CORBA::Object_ptr PortableServer::POA::create_reference (const char *intf, CORB this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_reference_calldata, &retval, &intf); return retval; - + } -static const TAO_Param_Data PortableServer_POA_create_reference_with_id_paramdata [] = +static const TAO_Param_Data PortableServer_POA_create_reference_with_id_paramdata [] = { {CORBA::_tc_Object, PARAM_RETURN, 0}, {PortableServer::_tc_ObjectId, PARAM_IN, 0}, {PortableServer::_tc_RepositoryId, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_create_reference_with_id_calldata = +static const TAO_Call_Data PortableServer_POA_create_reference_with_id_calldata = {"create_reference_with_id", 1, 3, PortableServer_POA_create_reference_with_id_paramdata, 0, 0}; CORBA::Object_ptr PortableServer::POA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA::Environment &env) @@ -2654,7 +2656,7 @@ CORBA::Object_ptr PortableServer::POA::create_reference_with_id (const Portable this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_create_reference_with_id_calldata, &retval, &oid, &intf); return retval; - + } PortableServer::ObjectId * PortableServer::POA::servant_to_id (PortableServer::Servant p_servant, CORBA::Environment &env) @@ -2678,13 +2680,13 @@ PortableServer::Servant PortableServer::POA::reference_to_servant (CORBA::Object } -static const TAO_Param_Data PortableServer_POA_reference_to_id_paramdata [] = +static const TAO_Param_Data PortableServer_POA_reference_to_id_paramdata [] = { {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)}, {CORBA::_tc_Object, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_reference_to_id_calldata = +static const TAO_Call_Data PortableServer_POA_reference_to_id_calldata = {"reference_to_id", 1, 2, PortableServer_POA_reference_to_id_paramdata, 0, 0}; PortableServer::ObjectId * PortableServer::POA::reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env) @@ -2700,7 +2702,7 @@ PortableServer::ObjectId * PortableServer::POA::reference_to_id (CORBA::Object_p this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_reference_to_id_calldata, &retval, &reference); return retval; - + } PortableServer::Servant PortableServer::POA::id_to_servant (const PortableServer::ObjectId &oid, CORBA::Environment &env) @@ -2710,13 +2712,13 @@ PortableServer::Servant PortableServer::POA::id_to_servant (const PortableServer } -static const TAO_Param_Data PortableServer_POA_id_to_reference_paramdata [] = +static const TAO_Param_Data PortableServer_POA_id_to_reference_paramdata [] = { {CORBA::_tc_Object, PARAM_RETURN, 0}, {PortableServer::_tc_ObjectId, PARAM_IN, 0} }; -static const TAO_Call_Data PortableServer_POA_id_to_reference_calldata = +static const TAO_Call_Data PortableServer_POA_id_to_reference_calldata = {"id_to_reference", 1, 2, PortableServer_POA_id_to_reference_paramdata, 0, 0}; CORBA::Object_ptr PortableServer::POA::id_to_reference (const PortableServer::ObjectId &oid, CORBA::Environment &env) @@ -2732,7 +2734,7 @@ CORBA::Object_ptr PortableServer::POA::id_to_reference (const PortableServer::O this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_POA_id_to_reference_calldata, &retval, &oid); return retval; - + } CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -2740,9 +2742,9 @@ CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Envi if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_POA[] = @@ -2758,7 +2760,7 @@ PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer: { if (!CORBA::is_nil (obj)) obj->AddRef (); - + return obj; } // end of _duplicate @@ -2774,10 +2776,10 @@ PortableServer::Current_ptr PortableServer::Current::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { STUB_Object *istub; - PortableServer::Current_ptr new_obj; // to be returned + PortableServer::Current_ptr new_obj; // to be returned if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::Current::_nil (); - + new_obj = new PortableServer::Current (istub); // construct obj ref using the stub object return new_obj; } // end of if @@ -2800,19 +2802,19 @@ PortableServer::Current_ptr PortableServer::Current::_bind (const char *host, CO // get the object_ptr using Query Interface if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != TAO_NOERROR) { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return PortableServer::Current::_nil (); + env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); + return PortableServer::Current::_nil (); } data->Release (); // QueryInterface had bumped up our count if (CORBA::is_nil (objref)) - return PortableServer::Current::_nil (); + return PortableServer::Current::_nil (); else // narrow it - return PortableServer::Current::_narrow (objref, env); + return PortableServer::Current::_narrow (objref, env); } // copy constructor PortableServer::Current::NoContext::NoContext(const PortableServer::Current::NoContext &_tao_excp) - :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) + :CORBA_UserException (CORBA::TypeCode::_duplicate (_tao_excp.type ())) { } @@ -2825,13 +2827,13 @@ PortableServer::Current::NoContext::operator= (const PortableServer::Current::No } // narrow -PortableServer::Current::NoContext_ptr +PortableServer::Current::NoContext_ptr PortableServer::Current::NoContext::_narrow(CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:PortableServer/Current/NoContext:1.0", exc->id ())) // same type - return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc); + return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc); else - return 0; + return 0; } static const CORBA::Long _oc_PortableServer_Current_NoContext[] = @@ -2844,12 +2846,12 @@ static const CORBA::Long _oc_PortableServer_Current_NoContext[] = static CORBA::TypeCode _tc__tc_PortableServer_Current_NoContext (CORBA::tk_struct, sizeof (_oc_PortableServer_Current_NoContext), (unsigned char *) &_oc_PortableServer_Current_NoContext, CORBA::B_FALSE); CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc__tc_PortableServer_Current_NoContext; -static const TAO_Param_Data PortableServer_Current_get_POA_paramdata [] = +static const TAO_Param_Data PortableServer_Current_get_POA_paramdata [] = { {PortableServer::_tc_POA, PARAM_RETURN, 0} }; -static const TAO_Call_Data PortableServer_Current_get_POA_calldata = +static const TAO_Call_Data PortableServer_Current_get_POA_calldata = {"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata, 0, 0}; PortableServer::POA_ptr PortableServer::Current::get_POA (CORBA::Environment &env) @@ -2865,15 +2867,15 @@ PortableServer::POA_ptr PortableServer::Current::get_POA (CORBA::Environment &e this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_Current_get_POA_calldata, &retval); return PortableServer::POA::_narrow (retval, env); - + } -static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] = +static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] = { {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)} }; -static const TAO_Call_Data PortableServer_Current_get_object_id_calldata = +static const TAO_Call_Data PortableServer_Current_get_object_id_calldata = {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0}; PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &env) @@ -2889,7 +2891,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro this->Release (); // QueryInterface has bumped up our refcount istub->do_call (env, &PortableServer_Current_get_object_id_calldata, &retval); return retval; - + } CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) @@ -2898,9 +2900,9 @@ CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA:: (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) - return 1; // success using local knowledge + return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, _tao_environment); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_Current[] = @@ -2918,7 +2920,7 @@ PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id) return TAO_POA::ObjectId_to_string (id); } -wchar_t * +CORBA::WChar * PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id) { return TAO_POA::ObjectId_to_wstring (id); @@ -2931,9 +2933,7 @@ PortableServer::string_to_ObjectId (const char *id) } PortableServer::ObjectId * -PortableServer::wstring_to_ObjectId (const wchar_t *id) +PortableServer::wstring_to_ObjectId (const CORBA::WChar *id) { return TAO_POA::wstring_to_ObjectId (id); } - - diff --git a/TAO/tao/poaC.h b/TAO/tao/poaC.h index 9a2457fc919..859c84758d9 100644 --- a/TAO/tao/poaC.h +++ b/TAO/tao/poaC.h @@ -1,5 +1,7 @@ +// $Id$ +// // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO ORB and the TAO IDL Compiler have been developed by Washington +// TAO ORB and the TAO IDL Compiler have been developed by Washington // University Computer Science's Distributed Object Computing Group. // // Information on TAO is available at @@ -33,13 +35,13 @@ public: static CORBA::TypeCode_ptr _tc_RepositoryId; - + #if !defined (_PORTABLESERVER_CURRENTBASE___PTR_CH_) #define _PORTABLESERVER_CURRENTBASE___PTR_CH_ class CurrentBase; typedef CurrentBase *CurrentBase_ptr; - + #endif // end #if !defined @@ -53,14 +55,14 @@ class CurrentBase; CurrentBase_var (CurrentBase_ptr); CurrentBase_var (const CurrentBase_var &); // copy constructor ~CurrentBase_var (void); // destructor - + CurrentBase_var &operator= (CurrentBase_ptr); CurrentBase_var &operator= (const CurrentBase_var &); CurrentBase_ptr operator-> (void) const; - + operator const CurrentBase_ptr &() const; operator CurrentBase_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CurrentBase_ptr in (void) const; CurrentBase_ptr &inout (void); CurrentBase_ptr &out (void); @@ -90,7 +92,7 @@ class CurrentBase; operator CurrentBase_ptr &(); CurrentBase_ptr &ptr (void); CurrentBase_ptr operator-> (void); - + private: CurrentBase_ptr &ptr_; }; @@ -130,13 +132,13 @@ class CurrentBase; static CORBA::TypeCode_ptr _tc_CurrentBase; - + #if !defined (_PORTABLESERVER_POLICY___PTR_CH_) #define _PORTABLESERVER_POLICY___PTR_CH_ class Policy; typedef Policy *Policy_ptr; - + #endif // end #if !defined @@ -150,14 +152,14 @@ class Policy; Policy_var (Policy_ptr); Policy_var (const Policy_var &); // copy constructor ~Policy_var (void); // destructor - + Policy_var &operator= (Policy_ptr); Policy_var &operator= (const Policy_var &); Policy_ptr operator-> (void) const; - + operator const Policy_ptr &() const; operator Policy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Policy_ptr in (void) const; Policy_ptr &inout (void); Policy_ptr &out (void); @@ -187,7 +189,7 @@ class Policy; operator Policy_ptr &(); Policy_ptr &ptr (void); Policy_ptr operator-> (void); - + private: Policy_ptr &ptr_; }; @@ -236,7 +238,7 @@ class Policy; // ************************************************************* // _tao_seq_Policy // ************************************************************* - + typedef TAO_Unbounded_Object_Sequence<Policy > _tao_seq_Policy; typedef _tao_seq_Policy* _tao_seq_Policy_ptr; static CORBA::TypeCode_ptr _tc__tao_seq_Policy; @@ -259,17 +261,17 @@ class Policy; _tao_seq_Policy_var (_tao_seq_Policy *); _tao_seq_Policy_var (const _tao_seq_Policy_var &); // copy constructor ~_tao_seq_Policy_var (void); // destructor - + _tao_seq_Policy_var &operator= (_tao_seq_Policy *); _tao_seq_Policy_var &operator= (const _tao_seq_Policy_var &); _tao_seq_Policy *operator-> (void); const _tao_seq_Policy *operator-> (void) const; - + operator const _tao_seq_Policy &() const; operator _tao_seq_Policy &(); operator _tao_seq_Policy &() const; TAO_Object_Manager <Policy > operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const _tao_seq_Policy &in (void) const; _tao_seq_Policy &inout (void); _tao_seq_Policy *&out (void); @@ -299,7 +301,7 @@ class Policy; _tao_seq_Policy *&ptr (void); _tao_seq_Policy *operator-> (void); TAO_Object_Manager <Policy > operator[] (CORBA::ULong index); - + private: _tao_seq_Policy *&ptr_; // assignment from T_var not allowed @@ -316,11 +318,11 @@ class Policy; static CORBA::TypeCode_ptr _tc_PolicyList; class POA; - + #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ -typedef POA *POA_ptr; +typedef POA *POA_ptr; #endif // end #if !defined @@ -335,14 +337,14 @@ typedef POA *POA_ptr; POA_var (POA_ptr); POA_var (const POA_var &); // copy constructor ~POA_var (void); // destructor - + POA_var &operator= (POA_ptr); POA_var &operator= (const POA_var &); POA_ptr operator-> (void) const; - + operator const POA_ptr &() const; operator POA_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POA_ptr in (void) const; POA_ptr &inout (void); POA_ptr &out (void); @@ -372,7 +374,7 @@ typedef POA *POA_ptr; operator POA_ptr &(); POA_ptr &ptr (void); POA_ptr operator-> (void); - + private: POA_ptr &ptr_; }; @@ -387,7 +389,7 @@ typedef POA *POA_ptr; // ************************************************************* // _tao_seq_Octet // ************************************************************* - + typedef TAO_Unbounded_Sequence<CORBA::Octet > _tao_seq_Octet; typedef _tao_seq_Octet* _tao_seq_Octet_ptr; static CORBA::TypeCode_ptr _tc__tao_seq_Octet; @@ -410,17 +412,17 @@ typedef POA *POA_ptr; _tao_seq_Octet_var (_tao_seq_Octet *); _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor ~_tao_seq_Octet_var (void); // destructor - + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); _tao_seq_Octet *operator-> (void); const _tao_seq_Octet *operator-> (void) const; - + operator const _tao_seq_Octet &() const; operator _tao_seq_Octet &(); operator _tao_seq_Octet &() const; CORBA::Octet &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const _tao_seq_Octet &in (void) const; _tao_seq_Octet &inout (void); _tao_seq_Octet *&out (void); @@ -450,7 +452,7 @@ typedef POA *POA_ptr; _tao_seq_Octet *&ptr (void); _tao_seq_Octet *operator-> (void); CORBA::Octet &operator[] (CORBA::ULong index); - + private: _tao_seq_Octet *&ptr_; // assignment from T_var not allowed @@ -466,13 +468,13 @@ typedef POA *POA_ptr; static CORBA::TypeCode_ptr _tc_ObjectId; - + #if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_) #define _PORTABLESERVER_FORWARDREQUEST___PTR_CH_ class ForwardRequest; typedef ForwardRequest *ForwardRequest_ptr; - + #endif // end #if !defined @@ -497,19 +499,19 @@ typedef POA *POA_ptr; enum ThreadPolicyValue { - ORB_CTRL_MODEL, + ORB_CTRL_MODEL, SINGLE_THREAD_MODEL }; typedef ThreadPolicyValue &ThreadPolicyValue_out; static CORBA::TypeCode_ptr _tc_ThreadPolicyValue; - + #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_) #define _PORTABLESERVER_THREADPOLICY___PTR_CH_ class ThreadPolicy; typedef ThreadPolicy *ThreadPolicy_ptr; - + #endif // end #if !defined @@ -523,14 +525,14 @@ class ThreadPolicy; ThreadPolicy_var (ThreadPolicy_ptr); ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor ~ThreadPolicy_var (void); // destructor - + ThreadPolicy_var &operator= (ThreadPolicy_ptr); ThreadPolicy_var &operator= (const ThreadPolicy_var &); ThreadPolicy_ptr operator-> (void) const; - + operator const ThreadPolicy_ptr &() const; operator ThreadPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ThreadPolicy_ptr in (void) const; ThreadPolicy_ptr &inout (void); ThreadPolicy_ptr &out (void); @@ -560,7 +562,7 @@ class ThreadPolicy; operator ThreadPolicy_ptr &(); ThreadPolicy_ptr &ptr (void); ThreadPolicy_ptr operator-> (void); - + private: ThreadPolicy_ptr &ptr_; }; @@ -603,19 +605,19 @@ class ThreadPolicy; enum LifespanPolicyValue { - TRANSIENT, + TRANSIENT, PERSISTENT }; typedef LifespanPolicyValue &LifespanPolicyValue_out; static CORBA::TypeCode_ptr _tc_LifespanPolicyValue; - + #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_) #define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_ class LifespanPolicy; typedef LifespanPolicy *LifespanPolicy_ptr; - + #endif // end #if !defined @@ -629,14 +631,14 @@ class LifespanPolicy; LifespanPolicy_var (LifespanPolicy_ptr); LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor ~LifespanPolicy_var (void); // destructor - + LifespanPolicy_var &operator= (LifespanPolicy_ptr); LifespanPolicy_var &operator= (const LifespanPolicy_var &); LifespanPolicy_ptr operator-> (void) const; - + operator const LifespanPolicy_ptr &() const; operator LifespanPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn LifespanPolicy_ptr in (void) const; LifespanPolicy_ptr &inout (void); LifespanPolicy_ptr &out (void); @@ -666,7 +668,7 @@ class LifespanPolicy; operator LifespanPolicy_ptr &(); LifespanPolicy_ptr &ptr (void); LifespanPolicy_ptr operator-> (void); - + private: LifespanPolicy_ptr &ptr_; }; @@ -709,19 +711,19 @@ class LifespanPolicy; enum IdUniquenessPolicyValue { - UNIQUE_ID, + UNIQUE_ID, MULTIPLE_ID }; typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out; static CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; - + #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_ class IdUniquenessPolicy; typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr; - + #endif // end #if !defined @@ -735,14 +737,14 @@ class IdUniquenessPolicy; IdUniquenessPolicy_var (IdUniquenessPolicy_ptr); IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor ~IdUniquenessPolicy_var (void); // destructor - + IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr); IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &); IdUniquenessPolicy_ptr operator-> (void) const; - + operator const IdUniquenessPolicy_ptr &() const; operator IdUniquenessPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn IdUniquenessPolicy_ptr in (void) const; IdUniquenessPolicy_ptr &inout (void); IdUniquenessPolicy_ptr &out (void); @@ -772,7 +774,7 @@ class IdUniquenessPolicy; operator IdUniquenessPolicy_ptr &(); IdUniquenessPolicy_ptr &ptr (void); IdUniquenessPolicy_ptr operator-> (void); - + private: IdUniquenessPolicy_ptr &ptr_; }; @@ -815,19 +817,19 @@ class IdUniquenessPolicy; enum IdAssignmentPolicyValue { - USER_ID, + USER_ID, SYSTEM_ID }; typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out; static CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; - + #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_ class IdAssignmentPolicy; typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr; - + #endif // end #if !defined @@ -841,14 +843,14 @@ class IdAssignmentPolicy; IdAssignmentPolicy_var (IdAssignmentPolicy_ptr); IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor ~IdAssignmentPolicy_var (void); // destructor - + IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr); IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &); IdAssignmentPolicy_ptr operator-> (void) const; - + operator const IdAssignmentPolicy_ptr &() const; operator IdAssignmentPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn IdAssignmentPolicy_ptr in (void) const; IdAssignmentPolicy_ptr &inout (void); IdAssignmentPolicy_ptr &out (void); @@ -878,7 +880,7 @@ class IdAssignmentPolicy; operator IdAssignmentPolicy_ptr &(); IdAssignmentPolicy_ptr &ptr (void); IdAssignmentPolicy_ptr operator-> (void); - + private: IdAssignmentPolicy_ptr &ptr_; }; @@ -921,19 +923,19 @@ class IdAssignmentPolicy; enum ImplicitActivationPolicyValue { - IMPLICIT_ACTIVATION, + IMPLICIT_ACTIVATION, NO_IMPLICIT_ACTIVATION }; typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; - + #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_ class ImplicitActivationPolicy; typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr; - + #endif // end #if !defined @@ -947,14 +949,14 @@ class ImplicitActivationPolicy; ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr); ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor ~ImplicitActivationPolicy_var (void); // destructor - + ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr); ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &); ImplicitActivationPolicy_ptr operator-> (void) const; - + operator const ImplicitActivationPolicy_ptr &() const; operator ImplicitActivationPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ImplicitActivationPolicy_ptr in (void) const; ImplicitActivationPolicy_ptr &inout (void); ImplicitActivationPolicy_ptr &out (void); @@ -984,7 +986,7 @@ class ImplicitActivationPolicy; operator ImplicitActivationPolicy_ptr &(); ImplicitActivationPolicy_ptr &ptr (void); ImplicitActivationPolicy_ptr operator-> (void); - + private: ImplicitActivationPolicy_ptr &ptr_; }; @@ -1027,19 +1029,19 @@ class ImplicitActivationPolicy; enum ServantRetentionPolicyValue { - RETAIN, + RETAIN, NON_RETAIN }; typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; static CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; - + #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_ class ServantRetentionPolicy; typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr; - + #endif // end #if !defined @@ -1053,14 +1055,14 @@ class ServantRetentionPolicy; ServantRetentionPolicy_var (ServantRetentionPolicy_ptr); ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor ~ServantRetentionPolicy_var (void); // destructor - + ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr); ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &); ServantRetentionPolicy_ptr operator-> (void) const; - + operator const ServantRetentionPolicy_ptr &() const; operator ServantRetentionPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantRetentionPolicy_ptr in (void) const; ServantRetentionPolicy_ptr &inout (void); ServantRetentionPolicy_ptr &out (void); @@ -1090,7 +1092,7 @@ class ServantRetentionPolicy; operator ServantRetentionPolicy_ptr &(); ServantRetentionPolicy_ptr &ptr (void); ServantRetentionPolicy_ptr operator-> (void); - + private: ServantRetentionPolicy_ptr &ptr_; }; @@ -1133,20 +1135,20 @@ class ServantRetentionPolicy; enum RequestProcessingPolicyValue { - USE_ACTIVE_OBJECT_MAP_ONLY, - USE_DEFAULT_SERVANT, + USE_ACTIVE_OBJECT_MAP_ONLY, + USE_DEFAULT_SERVANT, USE_SERVANT_MANAGER }; typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; static CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; - + #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_ class RequestProcessingPolicy; typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr; - + #endif // end #if !defined @@ -1160,14 +1162,14 @@ class RequestProcessingPolicy; RequestProcessingPolicy_var (RequestProcessingPolicy_ptr); RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor ~RequestProcessingPolicy_var (void); // destructor - + RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr); RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &); RequestProcessingPolicy_ptr operator-> (void) const; - + operator const RequestProcessingPolicy_ptr &() const; operator RequestProcessingPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn RequestProcessingPolicy_ptr in (void) const; RequestProcessingPolicy_ptr &inout (void); RequestProcessingPolicy_ptr &out (void); @@ -1197,7 +1199,7 @@ class RequestProcessingPolicy; operator RequestProcessingPolicy_ptr &(); RequestProcessingPolicy_ptr &ptr (void); RequestProcessingPolicy_ptr operator-> (void); - + private: RequestProcessingPolicy_ptr &ptr_; }; @@ -1238,13 +1240,13 @@ class RequestProcessingPolicy; static CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; - + #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_) #define _PORTABLESERVER_POAMANAGER___PTR_CH_ class POAManager; typedef POAManager *POAManager_ptr; - + #endif // end #if !defined @@ -1258,14 +1260,14 @@ class POAManager; POAManager_var (POAManager_ptr); POAManager_var (const POAManager_var &); // copy constructor ~POAManager_var (void); // destructor - + POAManager_var &operator= (POAManager_ptr); POAManager_var &operator= (const POAManager_var &); POAManager_ptr operator-> (void) const; - + operator const POAManager_ptr &() const; operator POAManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POAManager_ptr in (void) const; POAManager_ptr &inout (void); POAManager_ptr &out (void); @@ -1295,7 +1297,7 @@ class POAManager; operator POAManager_ptr &(); POAManager_ptr &ptr (void); POAManager_ptr operator-> (void); - + private: POAManager_ptr &ptr_; }; @@ -1316,13 +1318,13 @@ class POAManager; static POAManager_ptr _nil (void); static POAManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - + #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_) #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_ class AdapterInactive; typedef AdapterInactive *AdapterInactive_ptr; - + #endif // end #if !defined @@ -1366,13 +1368,13 @@ class POAManager; static CORBA::TypeCode_ptr _tc_POAManager; - + #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_ class AdapterActivator; typedef AdapterActivator *AdapterActivator_ptr; - + #endif // end #if !defined @@ -1386,14 +1388,14 @@ class AdapterActivator; AdapterActivator_var (AdapterActivator_ptr); AdapterActivator_var (const AdapterActivator_var &); // copy constructor ~AdapterActivator_var (void); // destructor - + AdapterActivator_var &operator= (AdapterActivator_ptr); AdapterActivator_var &operator= (const AdapterActivator_var &); AdapterActivator_ptr operator-> (void) const; - + operator const AdapterActivator_ptr &() const; operator AdapterActivator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn AdapterActivator_ptr in (void) const; AdapterActivator_ptr &inout (void); AdapterActivator_ptr &out (void); @@ -1423,7 +1425,7 @@ class AdapterActivator; operator AdapterActivator_ptr &(); AdapterActivator_ptr &ptr (void); AdapterActivator_ptr operator-> (void); - + private: AdapterActivator_ptr &ptr_; }; @@ -1464,13 +1466,13 @@ class AdapterActivator; static CORBA::TypeCode_ptr _tc_AdapterActivator; - + #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_) #define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_ class ServantManager; typedef ServantManager *ServantManager_ptr; - + #endif // end #if !defined @@ -1484,14 +1486,14 @@ class ServantManager; ServantManager_var (ServantManager_ptr); ServantManager_var (const ServantManager_var &); // copy constructor ~ServantManager_var (void); // destructor - + ServantManager_var &operator= (ServantManager_ptr); ServantManager_var &operator= (const ServantManager_var &); ServantManager_ptr operator-> (void) const; - + operator const ServantManager_ptr &() const; operator ServantManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantManager_ptr in (void) const; ServantManager_ptr &inout (void); ServantManager_ptr &out (void); @@ -1521,7 +1523,7 @@ class ServantManager; operator ServantManager_ptr &(); ServantManager_ptr &ptr (void); ServantManager_ptr operator-> (void); - + private: ServantManager_ptr &ptr_; }; @@ -1561,13 +1563,13 @@ class ServantManager; static CORBA::TypeCode_ptr _tc_ServantManager; - + #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_ class ServantActivator; typedef ServantActivator *ServantActivator_ptr; - + #endif // end #if !defined @@ -1581,14 +1583,14 @@ class ServantActivator; ServantActivator_var (ServantActivator_ptr); ServantActivator_var (const ServantActivator_var &); // copy constructor ~ServantActivator_var (void); // destructor - + ServantActivator_var &operator= (ServantActivator_ptr); ServantActivator_var &operator= (const ServantActivator_var &); ServantActivator_ptr operator-> (void) const; - + operator const ServantActivator_ptr &() const; operator ServantActivator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantActivator_ptr in (void) const; ServantActivator_ptr &inout (void); ServantActivator_ptr &out (void); @@ -1618,7 +1620,7 @@ class ServantActivator; operator ServantActivator_ptr &(); ServantActivator_ptr &ptr (void); ServantActivator_ptr operator-> (void); - + private: ServantActivator_ptr &ptr_; }; @@ -1660,13 +1662,13 @@ class ServantActivator; static CORBA::TypeCode_ptr _tc_ServantActivator; - + #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_ class ServantLocator; typedef ServantLocator *ServantLocator_ptr; - + #endif // end #if !defined @@ -1680,14 +1682,14 @@ class ServantLocator; ServantLocator_var (ServantLocator_ptr); ServantLocator_var (const ServantLocator_var &); // copy constructor ~ServantLocator_var (void); // destructor - + ServantLocator_var &operator= (ServantLocator_ptr); ServantLocator_var &operator= (const ServantLocator_var &); ServantLocator_ptr operator-> (void) const; - + operator const ServantLocator_ptr &() const; operator ServantLocator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServantLocator_ptr in (void) const; ServantLocator_ptr &inout (void); ServantLocator_ptr &out (void); @@ -1717,7 +1719,7 @@ class ServantLocator; operator ServantLocator_ptr &(); ServantLocator_ptr &ptr (void); ServantLocator_ptr operator-> (void); - + private: ServantLocator_ptr &ptr_; }; @@ -1734,7 +1736,7 @@ class ServantLocator; public: typedef void *Cookie; - + // the static operations static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); @@ -1762,13 +1764,13 @@ class ServantLocator; static CORBA::TypeCode_ptr _tc_ServantLocator; - + #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ class POA; typedef POA *POA_ptr; - + #endif // end #if !defined @@ -1782,14 +1784,14 @@ class POA; POA_var (POA_ptr); POA_var (const POA_var &); // copy constructor ~POA_var (void); // destructor - + POA_var &operator= (POA_ptr); POA_var &operator= (const POA_var &); POA_ptr operator-> (void) const; - + operator const POA_ptr &() const; operator POA_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POA_ptr in (void) const; POA_ptr &inout (void); POA_ptr &out (void); @@ -1819,7 +1821,7 @@ class POA; operator POA_ptr &(); POA_ptr &ptr (void); POA_ptr operator-> (void); - + private: POA_ptr &ptr_; }; @@ -1840,13 +1842,13 @@ class POA; static POA_ptr _nil (void); static POA_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - + #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_ class AdapterAlreadyExists; typedef AdapterAlreadyExists *AdapterAlreadyExists_ptr; - + #endif // end #if !defined @@ -1867,13 +1869,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_ class AdapterInactive; typedef AdapterInactive *AdapterInactive_ptr; - + #endif // end #if !defined @@ -1894,13 +1896,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_ class AdapterNonExistent; typedef AdapterNonExistent *AdapterNonExistent_ptr; - + #endif // end #if !defined @@ -1921,13 +1923,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_) #define _PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_ class InvalidPolicy; typedef InvalidPolicy *InvalidPolicy_ptr; - + #endif // end #if !defined @@ -1950,13 +1952,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_) #define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_ class NoServant; typedef NoServant *NoServant_ptr; - + #endif // end #if !defined @@ -1977,13 +1979,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_ class ObjectAlreadyActive; typedef ObjectAlreadyActive *ObjectAlreadyActive_ptr; - + #endif // end #if !defined @@ -2004,13 +2006,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_ class ObjectNotActive; typedef ObjectNotActive *ObjectNotActive_ptr; - + #endif // end #if !defined @@ -2031,13 +2033,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_ class ServantAlreadyActive; typedef ServantAlreadyActive *ServantAlreadyActive_ptr; - + #endif // end #if !defined @@ -2058,13 +2060,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_ class ServantNotActive; typedef ServantNotActive *ServantNotActive_ptr; - + #endif // end #if !defined @@ -2085,13 +2087,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_) #define _PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_ class WrongAdapter; typedef WrongAdapter *WrongAdapter_ptr; - + #endif // end #if !defined @@ -2112,13 +2114,13 @@ class POA; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_) #define _PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_ class WrongPolicy; typedef WrongPolicy *WrongPolicy_ptr; - + #endif // end #if !defined @@ -2188,13 +2190,13 @@ class POA; static CORBA::TypeCode_ptr _tc_POA; - + #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_) #define _PORTABLESERVER_CURRENT___PTR_CH_ class Current; typedef Current *Current_ptr; - + #endif // end #if !defined @@ -2208,14 +2210,14 @@ class Current; Current_var (Current_ptr); Current_var (const Current_var &); // copy constructor ~Current_var (void); // destructor - + Current_var &operator= (Current_ptr); Current_var &operator= (const Current_var &); Current_ptr operator-> (void) const; - + operator const Current_ptr &() const; operator Current_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Current_ptr in (void) const; Current_ptr &inout (void); Current_ptr &out (void); @@ -2245,7 +2247,7 @@ class Current; operator Current_ptr &(); Current_ptr &ptr (void); Current_ptr operator-> (void); - + private: Current_ptr &ptr_; }; @@ -2266,13 +2268,13 @@ class Current; static Current_ptr _nil (void); static Current_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - + #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_) #define _PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_ class NoContext; typedef NoContext *NoContext_ptr; - + #endif // end #if !defined @@ -2315,9 +2317,9 @@ class Current; static CORBA::TypeCode_ptr _tc_Current; static char *ObjectId_to_string (const PortableServer::ObjectId &id); - static wchar_t *ObjectId_to_wstring (const PortableServer::ObjectId &id); + static CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id); static PortableServer::ObjectId *string_to_ObjectId (const char *id); - static PortableServer::ObjectId *wstring_to_ObjectId (const wchar_t *id); + static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); }; |