diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp')
| -rw-r--r-- | CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp | 1971 |
1 files changed, 888 insertions, 1083 deletions
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp index a000d175f0f..f45ed759337 100644 --- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp +++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp @@ -32,8 +32,9 @@ namespace CIAO } IdRef:: - IdRef (::CIAO::Config_Handlers::IdRef const& s) - : XSCRT::Type (), + IdRef (IdRef const& s) + : + XSCRT::Type (), href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0), idref_ (s.idref_.get () ? new ::XMLSchema::IDREF< ACE_TCHAR > (*s.idref_) : 0), regulator__ () @@ -42,8 +43,8 @@ namespace CIAO if (idref_.get ()) idref_->container (this); } - ::CIAO::Config_Handlers::IdRef& IdRef:: - operator= (::CIAO::Config_Handlers::IdRef const& s) + IdRef& IdRef:: + operator= (IdRef const& s) { if (s.href_.get ()) href (*(s.href_)); else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); @@ -167,7 +168,7 @@ namespace CIAO } DataType:: - DataType (::CIAO::Config_Handlers::DataType const& s) + DataType (DataType const& s) : ::XSCRT::Type (), kind_ (new ::CIAO::Config_Handlers::TCKind (*s.kind_)), @@ -176,7 +177,7 @@ namespace CIAO value_ (s.value_.get () ? new ::CIAO::Config_Handlers::ValueType (*s.value_) : 0), sequence_ (s.sequence_.get () ? new ::CIAO::Config_Handlers::SequenceType (*s.sequence_) : 0), alias_ (s.alias_.get () ? new ::CIAO::Config_Handlers::AliasType (*s.alias_) : 0), - xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0), + id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0), regulator__ () { kind_->container (this); @@ -185,31 +186,41 @@ namespace CIAO if (value_.get ()) value_->container (this); if (sequence_.get ()) sequence_->container (this); if (alias_.get ()) alias_->container (this); - if (xmi_id_.get ()) xmi_id_->container (this); + if (id_.get ()) id_->container (this); } - ::CIAO::Config_Handlers::DataType& DataType:: - operator= (::CIAO::Config_Handlers::DataType const& s) + DataType& DataType:: + operator= (DataType const& s) { - kind (s.kind ()); + kind (*s.kind_); - if (s.enum__.get ()) enum_ (*(s.enum__)); - else enum__ = ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > (0); + if (s.enum__.get ()) + enum_ (*(s.enum__)); + else + enum__.reset (0); - if (s.struct__.get ()) struct_ (*(s.struct__)); - else struct__ = ::std::auto_ptr< ::CIAO::Config_Handlers::StructType > (0); + if (s.struct__.get ()) + struct_ (*(s.struct__)); + else + struct__.reset (0); - if (s.value_.get ()) value (*(s.value_)); - else value_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ValueType > (0); + if (s.value_.get ()) + value (*(s.value_)); + else + value_.reset (0); - if (s.sequence_.get ()) sequence (*(s.sequence_)); - else sequence_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > (0); + if (s.sequence_.get ()) + sequence (*(s.sequence_)); + else + sequence_.reset (0); - if (s.alias_.get ()) alias (*(s.alias_)); - else alias_ = ::std::auto_ptr< ::CIAO::Config_Handlers::AliasType > (0); + if (s.alias_.get ()) + alias (*(s.alias_)); + else + alias_.reset (0); - if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_)); - else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); + if (s.id_.get ()) id (*(s.id_)); + else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); return *this; } @@ -377,35 +388,35 @@ namespace CIAO // DataType // bool DataType:: - xmi_id_p () const + id_p () const { - return xmi_id_.get () != 0; + return id_.get () != 0; } ::XMLSchema::ID< ACE_TCHAR > const& DataType:: - xmi_id () const + id () const { - return *xmi_id_; + return *id_; } ::XMLSchema::ID< ACE_TCHAR >& DataType:: - xmi_id () + id () { - return *xmi_id_; + return *id_; } void DataType:: - xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e) + id (::XMLSchema::ID< ACE_TCHAR > const& e) { - if (xmi_id_.get ()) + if (id_.get ()) { - *xmi_id_ = e; + *id_ = e; } else { - xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); - xmi_id_->container (this); + id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); + id_->container (this); } } @@ -416,155 +427,65 @@ namespace CIAO DataValue:: DataValue () : - ::XSCRT::Type (), regulator__ () { } DataValue:: - DataValue (::CIAO::Config_Handlers::DataValue const& s) + DataValue (DataValue const& s) : ::XSCRT::Type (), + short__ (s.short__), + long__ (s.long__), + ushort_ (s.ushort_), + ulong_ (s.ulong_), + float__ (s.float__), + double__ (s.double__), + boolean_ (s.boolean_), + octet_ (s.octet_), + enum__ (s.enum__), + string_ (s.string_), + longlong_ (s.longlong_), + ulonglong_ (s.ulonglong_), + longdouble_ (s.longdouble_), + element_ (s.element_), + member_ (s.member_), regulator__ () { - { - for (short_const_iterator i (s.short_.begin ());i != s.short_.end ();++i) add_short (*i); - } - - { - for (long_const_iterator i (s.long_.begin ());i != s.long_.end ();++i) add_long (*i); - } - - { - for (ushort_const_iterator i (s.ushort_.begin ());i != s.ushort_.end ();++i) add_ushort (*i); - } - - { - for (ulong_const_iterator i (s.ulong_.begin ());i != s.ulong_.end ();++i) add_ulong (*i); - } - - { - for (float_const_iterator i (s.float_.begin ());i != s.float_.end ();++i) add_float (*i); - } - - { - for (double_const_iterator i (s.double_.begin ());i != s.double_.end ();++i) add_double (*i); - } - - { - for (boolean_const_iterator i (s.boolean_.begin ());i != s.boolean_.end ();++i) add_boolean (*i); - } - - { - for (octet_const_iterator i (s.octet_.begin ());i != s.octet_.end ();++i) add_octet (*i); - } - - { - for (enum_const_iterator i (s.enum_.begin ());i != s.enum_.end ();++i) add_enum (*i); - } - - { - for (string_const_iterator i (s.string_.begin ());i != s.string_.end ();++i) add_string (*i); - } - - { - for (longlong_const_iterator i (s.longlong_.begin ());i != s.longlong_.end ();++i) add_longlong (*i); - } - - { - for (ulonglong_const_iterator i (s.ulonglong_.begin ());i != s.ulonglong_.end ();++i) add_ulonglong (*i); - } - - { - for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i); - } - - { - for (element_const_iterator i (s.element_.begin ());i != s.element_.end ();++i) add_element (*i); - } - - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } } - ::CIAO::Config_Handlers::DataValue& DataValue:: - operator= (::CIAO::Config_Handlers::DataValue const& s) + DataValue& DataValue:: + operator= (DataValue const& s) { - short_.clear (); - { - for (short_const_iterator i (s.short_.begin ());i != s.short_.end ();++i) add_short (*i); - } + short__ = s.short__; - long_.clear (); - { - for (long_const_iterator i (s.long_.begin ());i != s.long_.end ();++i) add_long (*i); - } + long__ = s.long__; - ushort_.clear (); - { - for (ushort_const_iterator i (s.ushort_.begin ());i != s.ushort_.end ();++i) add_ushort (*i); - } + ushort_ = s.ushort_; - ulong_.clear (); - { - for (ulong_const_iterator i (s.ulong_.begin ());i != s.ulong_.end ();++i) add_ulong (*i); - } + ulong_ = s.ulong_; - float_.clear (); - { - for (float_const_iterator i (s.float_.begin ());i != s.float_.end ();++i) add_float (*i); - } + float__ = s.float__; - double_.clear (); - { - for (double_const_iterator i (s.double_.begin ());i != s.double_.end ();++i) add_double (*i); - } + double__ = s.double__; - boolean_.clear (); - { - for (boolean_const_iterator i (s.boolean_.begin ());i != s.boolean_.end ();++i) add_boolean (*i); - } + boolean_ = s.boolean_; - octet_.clear (); - { - for (octet_const_iterator i (s.octet_.begin ());i != s.octet_.end ();++i) add_octet (*i); - } + octet_ = s.octet_; - enum_.clear (); - { - for (enum_const_iterator i (s.enum_.begin ());i != s.enum_.end ();++i) add_enum (*i); - } + enum__ = s.enum__; - string_.clear (); - { - for (string_const_iterator i (s.string_.begin ());i != s.string_.end ();++i) add_string (*i); - } + string_ = s.string_; - longlong_.clear (); - { - for (longlong_const_iterator i (s.longlong_.begin ());i != s.longlong_.end ();++i) add_longlong (*i); - } + longlong_ = s.longlong_; - ulonglong_.clear (); - { - for (ulonglong_const_iterator i (s.ulonglong_.begin ());i != s.ulonglong_.end ();++i) add_ulonglong (*i); - } + ulonglong_ = s.ulonglong_; - longdouble_.clear (); - { - for (longdouble_const_iterator i (s.longdouble_.begin ());i != s.longdouble_.end ();++i) add_longdouble (*i); - } + longdouble_ = s.longdouble_; - element_.clear (); - { - for (element_const_iterator i (s.element_.begin ());i != s.element_.end ();++i) add_element (*i); - } + element_ = s.element_; - member_.clear (); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } + member_ = s.member_; return *this; } @@ -575,37 +496,37 @@ namespace CIAO DataValue::short_iterator DataValue:: begin_short () { - return short_.begin (); + return short__.begin (); } DataValue::short_iterator DataValue:: end_short () { - return short_.end (); + return short__.end (); } DataValue::short_const_iterator DataValue:: begin_short () const { - return short_.begin (); + return short__.begin (); } DataValue::short_const_iterator DataValue:: end_short () const { - return short_.end (); + return short__.end (); } void DataValue:: - add_short (::XMLSchema::short_ const& e) + add_short (ACE_Refcounted_Auto_Ptr < ::XMLSchema::short_, ACE_Null_Mutex > const& e) { - short_.push_back (e); + short__.push_back (e); } size_t DataValue:: count_short(void) const { - return short_.size (); + return short__.size (); } // DataValue @@ -613,37 +534,37 @@ namespace CIAO DataValue::long_iterator DataValue:: begin_long () { - return long_.begin (); + return long__.begin (); } DataValue::long_iterator DataValue:: end_long () { - return long_.end (); + return long__.end (); } DataValue::long_const_iterator DataValue:: begin_long () const { - return long_.begin (); + return long__.begin (); } DataValue::long_const_iterator DataValue:: end_long () const { - return long_.end (); + return long__.end (); } void DataValue:: - add_long (::XMLSchema::int_ const& e) + add_long (ACE_Refcounted_Auto_Ptr < ::XMLSchema::int_, ACE_Null_Mutex > const& e) { - long_.push_back (e); + long__.push_back (e); } size_t DataValue:: count_long(void) const { - return long_.size (); + return long__.size (); } // DataValue @@ -673,7 +594,7 @@ namespace CIAO } void DataValue:: - add_ushort (::XMLSchema::unsignedShort const& e) + add_ushort (ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedShort, ACE_Null_Mutex > const& e) { ushort_.push_back (e); } @@ -711,7 +632,7 @@ namespace CIAO } void DataValue:: - add_ulong (::XMLSchema::unsignedInt const& e) + add_ulong (ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedInt, ACE_Null_Mutex > const& e) { ulong_.push_back (e); } @@ -727,37 +648,37 @@ namespace CIAO DataValue::float_iterator DataValue:: begin_float () { - return float_.begin (); + return float__.begin (); } DataValue::float_iterator DataValue:: end_float () { - return float_.end (); + return float__.end (); } DataValue::float_const_iterator DataValue:: begin_float () const { - return float_.begin (); + return float__.begin (); } DataValue::float_const_iterator DataValue:: end_float () const { - return float_.end (); + return float__.end (); } void DataValue:: - add_float (::XMLSchema::float_ const& e) + add_float (ACE_Refcounted_Auto_Ptr < ::XMLSchema::float_, ACE_Null_Mutex > const& e) { - float_.push_back (e); + float__.push_back (e); } size_t DataValue:: count_float(void) const { - return float_.size (); + return float__.size (); } // DataValue @@ -765,37 +686,37 @@ namespace CIAO DataValue::double_iterator DataValue:: begin_double () { - return double_.begin (); + return double__.begin (); } DataValue::double_iterator DataValue:: end_double () { - return double_.end (); + return double__.end (); } DataValue::double_const_iterator DataValue:: begin_double () const { - return double_.begin (); + return double__.begin (); } DataValue::double_const_iterator DataValue:: end_double () const { - return double_.end (); + return double__.end (); } void DataValue:: - add_double (::XMLSchema::double_ const& e) + add_double (ACE_Refcounted_Auto_Ptr < ::XMLSchema::double_, ACE_Null_Mutex > const& e) { - double_.push_back (e); + double__.push_back (e); } size_t DataValue:: count_double(void) const { - return double_.size (); + return double__.size (); } // DataValue @@ -825,7 +746,7 @@ namespace CIAO } void DataValue:: - add_boolean (::XMLSchema::boolean const& e) + add_boolean (ACE_Refcounted_Auto_Ptr < ::XMLSchema::boolean, ACE_Null_Mutex > const& e) { boolean_.push_back (e); } @@ -863,7 +784,7 @@ namespace CIAO } void DataValue:: - add_octet (::XMLSchema::unsignedByte const& e) + add_octet (ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedByte, ACE_Null_Mutex > const& e) { octet_.push_back (e); } @@ -879,37 +800,37 @@ namespace CIAO DataValue::enum_iterator DataValue:: begin_enum () { - return enum_.begin (); + return enum__.begin (); } DataValue::enum_iterator DataValue:: end_enum () { - return enum_.end (); + return enum__.end (); } DataValue::enum_const_iterator DataValue:: begin_enum () const { - return enum_.begin (); + return enum__.begin (); } DataValue::enum_const_iterator DataValue:: end_enum () const { - return enum_.end (); + return enum__.end (); } void DataValue:: - add_enum (::XMLSchema::string< ACE_TCHAR > const& e) + add_enum (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { - enum_.push_back (e); + enum__.push_back (e); } size_t DataValue:: count_enum(void) const { - return enum_.size (); + return enum__.size (); } // DataValue @@ -939,7 +860,7 @@ namespace CIAO } void DataValue:: - add_string (::XMLSchema::string< ACE_TCHAR > const& e) + add_string (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { string_.push_back (e); } @@ -977,7 +898,7 @@ namespace CIAO } void DataValue:: - add_longlong (::XMLSchema::long_ const& e) + add_longlong (ACE_Refcounted_Auto_Ptr < ::XMLSchema::long_, ACE_Null_Mutex > const& e) { longlong_.push_back (e); } @@ -1015,7 +936,7 @@ namespace CIAO } void DataValue:: - add_ulonglong (::XMLSchema::unsignedLong const& e) + add_ulonglong (ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedLong, ACE_Null_Mutex > const& e) { ulonglong_.push_back (e); } @@ -1053,7 +974,7 @@ namespace CIAO } void DataValue:: - add_longdouble (::XMLSchema::double_ const& e) + add_longdouble (ACE_Refcounted_Auto_Ptr < ::XMLSchema::double_, ACE_Null_Mutex > const& e) { longdouble_.push_back (e); } @@ -1091,7 +1012,7 @@ namespace CIAO } void DataValue:: - add_element (::CIAO::Config_Handlers::DataValue const& e) + add_element (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::DataValue, ACE_Null_Mutex > const& e) { element_.push_back (e); } @@ -1129,7 +1050,7 @@ namespace CIAO } void DataValue:: - add_member (::CIAO::Config_Handlers::NamedValue const& e) + add_member (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::NamedValue, ACE_Null_Mutex > const& e) { member_.push_back (e); } @@ -1149,7 +1070,6 @@ namespace CIAO ::XMLSchema::string< ACE_TCHAR > const& typeId__, ::CIAO::Config_Handlers::DataType const& elementType__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)), elementType_ (new ::CIAO::Config_Handlers::DataType (elementType__)), @@ -1161,7 +1081,7 @@ namespace CIAO } AliasType:: - AliasType (::CIAO::Config_Handlers::AliasType const& s) + AliasType (AliasType const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -1174,14 +1094,14 @@ namespace CIAO elementType_->container (this); } - ::CIAO::Config_Handlers::AliasType& AliasType:: - operator= (::CIAO::Config_Handlers::AliasType const& s) + AliasType& AliasType:: + operator= (AliasType const& s) { - name (s.name ()); + name (*s.name_); - typeId (s.typeId ()); + typeId (*s.typeId_); - elementType (s.elementType ()); + elementType (*s.elementType_); return *this; } @@ -1235,11 +1155,12 @@ namespace CIAO EnumType:: EnumType (::XMLSchema::string< ACE_TCHAR > const& name__, - ::XMLSchema::string< ACE_TCHAR > const& typeId__) + ::XMLSchema::string< ACE_TCHAR > const& typeId__, + ::std::list< ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > > const& member__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)), + member_ (member__), regulator__ () { name_->container (this); @@ -1247,31 +1168,26 @@ namespace CIAO } EnumType:: - EnumType (::CIAO::Config_Handlers::EnumType const& s) + EnumType (EnumType const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)), + member_ (s.member_), regulator__ () { name_->container (this); typeId_->container (this); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } } - ::CIAO::Config_Handlers::EnumType& EnumType:: - operator= (::CIAO::Config_Handlers::EnumType const& s) + EnumType& EnumType:: + operator= (EnumType const& s) { - name (s.name ()); + name (*s.name_); - typeId (s.typeId ()); + typeId (*s.typeId_); - member_.clear (); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } + member_ = s.member_; return *this; } @@ -1332,7 +1248,7 @@ namespace CIAO } void EnumType:: - add_member (::XMLSchema::string< ACE_TCHAR > const& e) + add_member (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { member_.push_back (e); } @@ -1351,7 +1267,6 @@ namespace CIAO StructType (::XMLSchema::string< ACE_TCHAR > const& name__, ::XMLSchema::string< ACE_TCHAR > const& typeId__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)), regulator__ () @@ -1361,31 +1276,26 @@ namespace CIAO } StructType:: - StructType (::CIAO::Config_Handlers::StructType const& s) + StructType (StructType const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)), + member_ (s.member_), regulator__ () { name_->container (this); typeId_->container (this); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } } - ::CIAO::Config_Handlers::StructType& StructType:: - operator= (::CIAO::Config_Handlers::StructType const& s) + StructType& StructType:: + operator= (StructType const& s) { - name (s.name ()); + name (*s.name_); - typeId (s.typeId ()); + typeId (*s.typeId_); - member_.clear (); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } + member_ = s.member_; return *this; } @@ -1446,7 +1356,7 @@ namespace CIAO } void StructType:: - add_member (::CIAO::Config_Handlers::StructMemberType const& e) + add_member (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::StructMemberType, ACE_Null_Mutex > const& e) { member_.push_back (e); } @@ -1465,7 +1375,6 @@ namespace CIAO StructMemberType (::XMLSchema::string< ACE_TCHAR > const& name__, ::CIAO::Config_Handlers::DataType const& type__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), type_ (new ::CIAO::Config_Handlers::DataType (type__)), regulator__ () @@ -1475,7 +1384,7 @@ namespace CIAO } StructMemberType:: - StructMemberType (::CIAO::Config_Handlers::StructMemberType const& s) + StructMemberType (StructMemberType const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -1486,12 +1395,12 @@ namespace CIAO type_->container (this); } - ::CIAO::Config_Handlers::StructMemberType& StructMemberType:: - operator= (::CIAO::Config_Handlers::StructMemberType const& s) + StructMemberType& StructMemberType:: + operator= (StructMemberType const& s) { - name (s.name ()); + name (*s.name_); - type (s.type ()); + type (*s.type_); return *this; } @@ -1535,7 +1444,6 @@ namespace CIAO ::XMLSchema::string< ACE_TCHAR > const& modifier__, ::CIAO::Config_Handlers::DataType const& baseType__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (typeId__)), modifier_ (new ::XMLSchema::string< ACE_TCHAR > (modifier__)), @@ -1549,39 +1457,34 @@ namespace CIAO } ValueType:: - ValueType (::CIAO::Config_Handlers::ValueType const& s) + ValueType (ValueType const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), typeId_ (new ::XMLSchema::string< ACE_TCHAR > (*s.typeId_)), modifier_ (new ::XMLSchema::string< ACE_TCHAR > (*s.modifier_)), baseType_ (new ::CIAO::Config_Handlers::DataType (*s.baseType_)), + member_ (s.member_), regulator__ () { name_->container (this); typeId_->container (this); modifier_->container (this); baseType_->container (this); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } } - ::CIAO::Config_Handlers::ValueType& ValueType:: - operator= (::CIAO::Config_Handlers::ValueType const& s) + ValueType& ValueType:: + operator= (ValueType const& s) { - name (s.name ()); + name (*s.name_); - typeId (s.typeId ()); + typeId (*s.typeId_); - modifier (s.modifier ()); + modifier (*s.modifier_); - baseType (s.baseType ()); + baseType (*s.baseType_); - member_.clear (); - { - for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i); - } + member_ = s.member_; return *this; } @@ -1670,7 +1573,7 @@ namespace CIAO } void ValueType:: - add_member (::CIAO::Config_Handlers::ValueMemberType const& e) + add_member (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ValueMemberType, ACE_Null_Mutex > const& e) { member_.push_back (e); } @@ -1690,7 +1593,6 @@ namespace CIAO ::XMLSchema::string< ACE_TCHAR > const& visibility__, ::CIAO::Config_Handlers::DataType const& type__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), visibility_ (new ::XMLSchema::string< ACE_TCHAR > (visibility__)), type_ (new ::CIAO::Config_Handlers::DataType (type__)), @@ -1702,7 +1604,7 @@ namespace CIAO } ValueMemberType:: - ValueMemberType (::CIAO::Config_Handlers::ValueMemberType const& s) + ValueMemberType (ValueMemberType const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -1715,14 +1617,14 @@ namespace CIAO type_->container (this); } - ::CIAO::Config_Handlers::ValueMemberType& ValueMemberType:: - operator= (::CIAO::Config_Handlers::ValueMemberType const& s) + ValueMemberType& ValueMemberType:: + operator= (ValueMemberType const& s) { - name (s.name ()); + name (*s.name_); - visibility (s.visibility ()); + visibility (*s.visibility_); - type (s.type ()); + type (*s.type_); return *this; } @@ -1778,7 +1680,6 @@ namespace CIAO NamedValue (::XMLSchema::string< ACE_TCHAR > const& name__, ::CIAO::Config_Handlers::DataValue const& value__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), value_ (new ::CIAO::Config_Handlers::DataValue (value__)), regulator__ () @@ -1788,7 +1689,7 @@ namespace CIAO } NamedValue:: - NamedValue (::CIAO::Config_Handlers::NamedValue const& s) + NamedValue (NamedValue const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -1799,12 +1700,12 @@ namespace CIAO value_->container (this); } - ::CIAO::Config_Handlers::NamedValue& NamedValue:: - operator= (::CIAO::Config_Handlers::NamedValue const& s) + NamedValue& NamedValue:: + operator= (NamedValue const& s) { - name (s.name ()); + name (*s.name_); - value (s.value ()); + value (*s.value_); return *this; } @@ -1845,7 +1746,6 @@ namespace CIAO SequenceType:: SequenceType (::CIAO::Config_Handlers::DataType const& elementType__) : - ::XSCRT::Type (), elementType_ (new ::CIAO::Config_Handlers::DataType (elementType__)), regulator__ () { @@ -1853,7 +1753,7 @@ namespace CIAO } SequenceType:: - SequenceType (::CIAO::Config_Handlers::SequenceType const& s) + SequenceType (SequenceType const& s) : ::XSCRT::Type (), bound_ (s.bound_.get () ? new ::XMLSchema::unsignedInt (*s.bound_) : 0), @@ -1864,13 +1764,15 @@ namespace CIAO elementType_->container (this); } - ::CIAO::Config_Handlers::SequenceType& SequenceType:: - operator= (::CIAO::Config_Handlers::SequenceType const& s) + SequenceType& SequenceType:: + operator= (SequenceType const& s) { - if (s.bound_.get ()) bound (*(s.bound_)); - else bound_ = ::std::auto_ptr< ::XMLSchema::unsignedInt > (0); + if (s.bound_.get ()) + bound (*(s.bound_)); + else + bound_.reset (0); - elementType (s.elementType ()); + elementType (*s.elementType_); return *this; } @@ -1927,7 +1829,6 @@ namespace CIAO Any (::CIAO::Config_Handlers::DataType const& type__, ::CIAO::Config_Handlers::DataValue const& value__) : - ::XSCRT::Type (), type_ (new ::CIAO::Config_Handlers::DataType (type__)), value_ (new ::CIAO::Config_Handlers::DataValue (value__)), regulator__ () @@ -1937,7 +1838,7 @@ namespace CIAO } Any:: - Any (::CIAO::Config_Handlers::Any const& s) + Any (Any const& s) : ::XSCRT::Type (), type_ (new ::CIAO::Config_Handlers::DataType (*s.type_)), @@ -1948,12 +1849,12 @@ namespace CIAO value_->container (this); } - ::CIAO::Config_Handlers::Any& Any:: - operator= (::CIAO::Config_Handlers::Any const& s) + Any& Any:: + operator= (Any const& s) { - type (s.type ()); + type (*s.type_); - value (s.value ()); + value (*s.value_); return *this; } @@ -1995,7 +1896,6 @@ namespace CIAO Property (::XMLSchema::string< ACE_TCHAR > const& name__, ::CIAO::Config_Handlers::Any const& value__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), value_ (new ::CIAO::Config_Handlers::Any (value__)), regulator__ () @@ -2005,7 +1905,7 @@ namespace CIAO } Property:: - Property (::CIAO::Config_Handlers::Property const& s) + Property (Property const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -2016,12 +1916,12 @@ namespace CIAO value_->container (this); } - ::CIAO::Config_Handlers::Property& Property:: - operator= (::CIAO::Config_Handlers::Property const& s) + Property& Property:: + operator= (Property const& s) { - name (s.name ()); + name (*s.name_); - value (s.value ()); + value (*s.value_); return *this; } @@ -2092,7 +1992,6 @@ namespace CIAO ::XMLSchema::boolean const& dynamic__, ::CIAO::Config_Handlers::Any const& value__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), kind_ (new ::CIAO::Config_Handlers::SatisfierPropertyKind (kind__)), dynamic_ (new ::XMLSchema::boolean (dynamic__)), @@ -2106,7 +2005,7 @@ namespace CIAO } SatisfierProperty:: - SatisfierProperty (::CIAO::Config_Handlers::SatisfierProperty const& s) + SatisfierProperty (SatisfierProperty const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -2121,16 +2020,16 @@ namespace CIAO value_->container (this); } - ::CIAO::Config_Handlers::SatisfierProperty& SatisfierProperty:: - operator= (::CIAO::Config_Handlers::SatisfierProperty const& s) + SatisfierProperty& SatisfierProperty:: + operator= (SatisfierProperty const& s) { - name (s.name ()); + name (*s.name_); - kind (s.kind ()); + kind (*s.kind_); - dynamic (s.dynamic ()); + dynamic (*s.dynamic_); - value (s.value ()); + value (*s.value_); return *this; } @@ -2197,46 +2096,36 @@ namespace CIAO // Resource:: - Resource (::XMLSchema::string< ACE_TCHAR > const& name__) + Resource (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > > const& resourceType__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), + resourceType_ (resourceType__), regulator__ () { name_->container (this); } Resource:: - Resource (::CIAO::Config_Handlers::Resource const& s) + Resource (Resource const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), + resourceType_ (s.resourceType_), + property_ (s.property_), regulator__ () { name_->container (this); - { - for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i); - } - - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::Resource& Resource:: - operator= (::CIAO::Config_Handlers::Resource const& s) + Resource& Resource:: + operator= (Resource const& s) { - name (s.name ()); + name (*s.name_); - resourceType_.clear (); - { - for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i); - } + resourceType_ = s.resourceType_; - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -2283,7 +2172,7 @@ namespace CIAO } void Resource:: - add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e) + add_resourceType (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { resourceType_.push_back (e); } @@ -2321,7 +2210,7 @@ namespace CIAO } void Resource:: - add_property (::CIAO::Config_Handlers::SatisfierProperty const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -2340,7 +2229,6 @@ namespace CIAO Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__, ::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () @@ -2350,31 +2238,26 @@ namespace CIAO } Requirement:: - Requirement (::CIAO::Config_Handlers::Requirement const& s) + Requirement (Requirement const& s) : ::XSCRT::Type (), resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), + property_ (s.property_), regulator__ () { resourceType_->container (this); name_->container (this); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::Requirement& Requirement:: - operator= (::CIAO::Config_Handlers::Requirement const& s) + Requirement& Requirement:: + operator= (Requirement const& s) { - resourceType (s.resourceType ()); + resourceType (*s.resourceType_); - name (s.name ()); + name (*s.name_); - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -2435,7 +2318,7 @@ namespace CIAO } void Requirement:: - add_property (::CIAO::Config_Handlers::Property const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -2454,7 +2337,6 @@ namespace CIAO ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__, ::XMLSchema::string< ACE_TCHAR > const& resourceName__) : - ::XSCRT::Type (), requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)), resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)), regulator__ () @@ -2464,31 +2346,26 @@ namespace CIAO } ResourceDeploymentDescription:: - ResourceDeploymentDescription (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s) + ResourceDeploymentDescription (ResourceDeploymentDescription const& s) : ::XSCRT::Type (), requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)), resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)), + property_ (s.property_), regulator__ () { requirementName_->container (this); resourceName_->container (this); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::ResourceDeploymentDescription& ResourceDeploymentDescription:: - operator= (::CIAO::Config_Handlers::ResourceDeploymentDescription const& s) + ResourceDeploymentDescription& ResourceDeploymentDescription:: + operator= (ResourceDeploymentDescription const& s) { - requirementName (s.requirementName ()); + requirementName (*s.requirementName_); - resourceName (s.resourceName ()); + resourceName (*s.resourceName_); - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -2549,7 +2426,7 @@ namespace CIAO } void ResourceDeploymentDescription:: - add_property (::CIAO::Config_Handlers::Property const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -2568,7 +2445,6 @@ namespace CIAO ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__, ::XMLSchema::string< ACE_TCHAR > const& node__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)), regulator__ () @@ -2578,73 +2454,43 @@ namespace CIAO } ArtifactDeploymentDescription:: - ArtifactDeploymentDescription (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s) + ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), + source_ (s.source_), node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)), - xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0), + location_ (s.location_), + execParameter_ (s.execParameter_), + deployRequirement_ (s.deployRequirement_), + deployedResource_ (s.deployedResource_), + id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0), regulator__ () { name_->container (this); - { - for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i); - } - node_->container (this); - { - for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i); - } - - { - for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i); - } - - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } - - { - for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i); - } - - if (xmi_id_.get ()) xmi_id_->container (this); + if (id_.get ()) id_->container (this); } - ::CIAO::Config_Handlers::ArtifactDeploymentDescription& ArtifactDeploymentDescription:: - operator= (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& s) + ArtifactDeploymentDescription& ArtifactDeploymentDescription:: + operator= (ArtifactDeploymentDescription const& s) { - name (s.name ()); + name (*s.name_); - source_.clear (); - { - for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i); - } + source_ = s.source_; - node (s.node ()); + node (*s.node_); - location_.clear (); - { - for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i); - } + location_ = s.location_; - execParameter_.clear (); - { - for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i); - } + execParameter_ = s.execParameter_; - deployRequirement_.clear (); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } + deployRequirement_ = s.deployRequirement_; - deployedResource_.clear (); - { - for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i); - } + deployedResource_ = s.deployedResource_; - if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_)); - else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); + if (s.id_.get ()) id (*(s.id_)); + else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); return *this; } @@ -2691,7 +2537,7 @@ namespace CIAO } void ArtifactDeploymentDescription:: - add_source (::XMLSchema::string< ACE_TCHAR > const& e) + add_source (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { source_.push_back (e); } @@ -2743,7 +2589,7 @@ namespace CIAO } void ArtifactDeploymentDescription:: - add_location (::XMLSchema::string< ACE_TCHAR > const& e) + add_location (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { location_.push_back (e); } @@ -2781,7 +2627,7 @@ namespace CIAO } void ArtifactDeploymentDescription:: - add_execParameter (::CIAO::Config_Handlers::Property const& e) + add_execParameter (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { execParameter_.push_back (e); } @@ -2819,7 +2665,7 @@ namespace CIAO } void ArtifactDeploymentDescription:: - add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e) + add_deployRequirement (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > const& e) { deployRequirement_.push_back (e); } @@ -2857,7 +2703,7 @@ namespace CIAO } void ArtifactDeploymentDescription:: - add_deployedResource (::CIAO::Config_Handlers::ResourceDeploymentDescription const& e) + add_deployedResource (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ResourceDeploymentDescription, ACE_Null_Mutex > const& e) { deployedResource_.push_back (e); } @@ -2871,35 +2717,35 @@ namespace CIAO // ArtifactDeploymentDescription // bool ArtifactDeploymentDescription:: - xmi_id_p () const + id_p () const { - return xmi_id_.get () != 0; + return id_.get () != 0; } ::XMLSchema::ID< ACE_TCHAR > const& ArtifactDeploymentDescription:: - xmi_id () const + id () const { - return *xmi_id_; + return *id_; } ::XMLSchema::ID< ACE_TCHAR >& ArtifactDeploymentDescription:: - xmi_id () + id () { - return *xmi_id_; + return *id_; } void ArtifactDeploymentDescription:: - xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e) + id (::XMLSchema::ID< ACE_TCHAR > const& e) { - if (xmi_id_.get ()) + if (id_.get ()) { - *xmi_id_ = e; + *id_ = e; } else { - xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); - xmi_id_->container (this); + id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); + id_->container (this); } } @@ -2910,7 +2756,6 @@ namespace CIAO MonolithicDeploymentDescription:: MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -2918,60 +2763,36 @@ namespace CIAO } MonolithicDeploymentDescription:: - MonolithicDeploymentDescription (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s) + MonolithicDeploymentDescription (MonolithicDeploymentDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), - xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0), + source_ (s.source_), + artifact_ (s.artifact_), + execParameter_ (s.execParameter_), + deployRequirement_ (s.deployRequirement_), + id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0), regulator__ () { name_->container (this); - { - for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i); - } - - { - for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i); - } - - { - for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i); - } - - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } - - if (xmi_id_.get ()) xmi_id_->container (this); + if (id_.get ()) id_->container (this); } - ::CIAO::Config_Handlers::MonolithicDeploymentDescription& MonolithicDeploymentDescription:: - operator= (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& s) + MonolithicDeploymentDescription& MonolithicDeploymentDescription:: + operator= (MonolithicDeploymentDescription const& s) { - name (s.name ()); + name (*s.name_); - source_.clear (); - { - for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i); - } + source_ = s.source_; - artifact_.clear (); - { - for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i); - } + artifact_ = s.artifact_; - execParameter_.clear (); - { - for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i); - } + execParameter_ = s.execParameter_; - deployRequirement_.clear (); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } + deployRequirement_ = s.deployRequirement_; - if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_)); - else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); + if (s.id_.get ()) id (*(s.id_)); + else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); return *this; } @@ -3018,7 +2839,7 @@ namespace CIAO } void MonolithicDeploymentDescription:: - add_source (::XMLSchema::string< ACE_TCHAR > const& e) + add_source (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { source_.push_back (e); } @@ -3056,7 +2877,7 @@ namespace CIAO } void MonolithicDeploymentDescription:: - add_artifact (::CIAO::Config_Handlers::IdRef const& e) + add_artifact (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::IdRef, ACE_Null_Mutex > const& e) { artifact_.push_back (e); } @@ -3094,7 +2915,7 @@ namespace CIAO } void MonolithicDeploymentDescription:: - add_execParameter (::CIAO::Config_Handlers::Property const& e) + add_execParameter (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { execParameter_.push_back (e); } @@ -3132,7 +2953,7 @@ namespace CIAO } void MonolithicDeploymentDescription:: - add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e) + add_deployRequirement (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > const& e) { deployRequirement_.push_back (e); } @@ -3146,35 +2967,35 @@ namespace CIAO // MonolithicDeploymentDescription // bool MonolithicDeploymentDescription:: - xmi_id_p () const + id_p () const { - return xmi_id_.get () != 0; + return id_.get () != 0; } ::XMLSchema::ID< ACE_TCHAR > const& MonolithicDeploymentDescription:: - xmi_id () const + id () const { - return *xmi_id_; + return *id_; } ::XMLSchema::ID< ACE_TCHAR >& MonolithicDeploymentDescription:: - xmi_id () + id () { - return *xmi_id_; + return *id_; } void MonolithicDeploymentDescription:: - xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e) + id (::XMLSchema::ID< ACE_TCHAR > const& e) { - if (xmi_id_.get ()) + if (id_.get ()) { - *xmi_id_ = e; + *id_ = e; } else { - xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); - xmi_id_->container (this); + id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); + id_->container (this); } } @@ -3214,7 +3035,6 @@ namespace CIAO ::XMLSchema::string< ACE_TCHAR > const& requirementName__, ::XMLSchema::string< ACE_TCHAR > const& resourceName__) : - ::XSCRT::Type (), resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (resourceUsage__)), requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)), resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)), @@ -3226,35 +3046,30 @@ namespace CIAO } InstanceResourceDeploymentDescription:: - InstanceResourceDeploymentDescription (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s) + InstanceResourceDeploymentDescription (InstanceResourceDeploymentDescription const& s) : ::XSCRT::Type (), resourceUsage_ (new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_)), requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)), resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)), + property_ (s.property_), regulator__ () { resourceUsage_->container (this); requirementName_->container (this); resourceName_->container (this); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription:: - operator= (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& s) + InstanceResourceDeploymentDescription& InstanceResourceDeploymentDescription:: + operator= (InstanceResourceDeploymentDescription const& s) { - resourceUsage (s.resourceUsage ()); + resourceUsage (*s.resourceUsage_); - requirementName (s.requirementName ()); + requirementName (*s.requirementName_); - resourceName (s.resourceName ()); + resourceName (*s.resourceName_); - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -3329,7 +3144,7 @@ namespace CIAO } void InstanceResourceDeploymentDescription:: - add_property (::CIAO::Config_Handlers::Property const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -3350,7 +3165,6 @@ namespace CIAO ::XMLSchema::string< ACE_TCHAR > const& source__, ::CIAO::Config_Handlers::IdRef const& implementation__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)), source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)), @@ -3364,59 +3178,49 @@ namespace CIAO } InstanceDeploymentDescription:: - InstanceDeploymentDescription (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s) + InstanceDeploymentDescription (InstanceDeploymentDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)), source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)), implementation_ (new ::CIAO::Config_Handlers::IdRef (*s.implementation_)), + configProperty_ (s.configProperty_), + deployedResource_ (s.deployedResource_), deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0), - xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0), + id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0), regulator__ () { name_->container (this); node_->container (this); source_->container (this); implementation_->container (this); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } - - { - for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i); - } - if (deployedSharedResource_.get ()) deployedSharedResource_->container (this); - if (xmi_id_.get ()) xmi_id_->container (this); + if (id_.get ()) id_->container (this); } - ::CIAO::Config_Handlers::InstanceDeploymentDescription& InstanceDeploymentDescription:: - operator= (::CIAO::Config_Handlers::InstanceDeploymentDescription const& s) + InstanceDeploymentDescription& InstanceDeploymentDescription:: + operator= (InstanceDeploymentDescription const& s) { - name (s.name ()); + name (*s.name_); - node (s.node ()); + node (*s.node_); - source (s.source ()); + source (*s.source_); - implementation (s.implementation ()); + implementation (*s.implementation_); - configProperty_.clear (); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } + configProperty_ = s.configProperty_; - deployedResource_.clear (); - { - for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i); - } + deployedResource_ = s.deployedResource_; - if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_)); - else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0); + if (s.deployedSharedResource_.get ()) + deployedSharedResource (*(s.deployedSharedResource_)); + else + deployedSharedResource_.reset (0); - if (s.xmi_id_.get ()) xmi_id (*(s.xmi_id_)); - else xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); + if (s.id_.get ()) id (*(s.id_)); + else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); return *this; } @@ -3505,7 +3309,7 @@ namespace CIAO } void InstanceDeploymentDescription:: - add_configProperty (::CIAO::Config_Handlers::Property const& e) + add_configProperty (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { configProperty_.push_back (e); } @@ -3543,7 +3347,7 @@ namespace CIAO } void InstanceDeploymentDescription:: - add_deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e) + add_deployedResource (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription, ACE_Null_Mutex > const& e) { deployedResource_.push_back (e); } @@ -3586,35 +3390,35 @@ namespace CIAO // InstanceDeploymentDescription // bool InstanceDeploymentDescription:: - xmi_id_p () const + id_p () const { - return xmi_id_.get () != 0; + return id_.get () != 0; } ::XMLSchema::ID< ACE_TCHAR > const& InstanceDeploymentDescription:: - xmi_id () const + id () const { - return *xmi_id_; + return *id_; } ::XMLSchema::ID< ACE_TCHAR >& InstanceDeploymentDescription:: - xmi_id () + id () { - return *xmi_id_; + return *id_; } void InstanceDeploymentDescription:: - xmi_id (::XMLSchema::ID< ACE_TCHAR > const& e) + id (::XMLSchema::ID< ACE_TCHAR > const& e) { - if (xmi_id_.get ()) + if (id_.get ()) { - *xmi_id_ = e; + *id_ = e; } else { - xmi_id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); - xmi_id_->container (this); + id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e)); + id_->container (this); } } @@ -3657,7 +3461,6 @@ namespace CIAO ::XMLSchema::boolean const& optional__, ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), provider_ (new ::XMLSchema::boolean (provider__)), exclusiveProvider_ (new ::XMLSchema::boolean (exclusiveProvider__)), @@ -3675,11 +3478,12 @@ namespace CIAO } ComponentPortDescription:: - ComponentPortDescription (::CIAO::Config_Handlers::ComponentPortDescription const& s) + ComponentPortDescription (ComponentPortDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0), + supportedType_ (s.supportedType_), provider_ (new ::XMLSchema::boolean (*s.provider_)), exclusiveProvider_ (new ::XMLSchema::boolean (*s.exclusiveProvider_)), exclusiveUser_ (new ::XMLSchema::boolean (*s.exclusiveUser_)), @@ -3689,10 +3493,6 @@ namespace CIAO { name_->container (this); if (specificType_.get ()) specificType_->container (this); - { - for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i); - } - provider_->container (this); exclusiveProvider_->container (this); exclusiveUser_->container (this); @@ -3700,28 +3500,27 @@ namespace CIAO kind_->container (this); } - ::CIAO::Config_Handlers::ComponentPortDescription& ComponentPortDescription:: - operator= (::CIAO::Config_Handlers::ComponentPortDescription const& s) + ComponentPortDescription& ComponentPortDescription:: + operator= (ComponentPortDescription const& s) { - name (s.name ()); + name (*s.name_); - if (s.specificType_.get ()) specificType (*(s.specificType_)); - else specificType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.specificType_.get ()) + specificType (*(s.specificType_)); + else + specificType_.reset (0); - supportedType_.clear (); - { - for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i); - } + supportedType_ = s.supportedType_; - provider (s.provider ()); + provider (*s.provider_); - exclusiveProvider (s.exclusiveProvider ()); + exclusiveProvider (*s.exclusiveProvider_); - exclusiveUser (s.exclusiveUser ()); + exclusiveUser (*s.exclusiveUser_); - optional (s.optional ()); + optional (*s.optional_); - kind (s.kind ()); + kind (*s.kind_); return *this; } @@ -3797,7 +3596,7 @@ namespace CIAO } void ComponentPortDescription:: - add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e) + add_supportedType (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { supportedType_.push_back (e); } @@ -3886,7 +3685,6 @@ namespace CIAO ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__, ::CIAO::Config_Handlers::DataType const& type__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), type_ (new ::CIAO::Config_Handlers::DataType (type__)), regulator__ () @@ -3896,7 +3694,7 @@ namespace CIAO } ComponentPropertyDescription:: - ComponentPropertyDescription (::CIAO::Config_Handlers::ComponentPropertyDescription const& s) + ComponentPropertyDescription (ComponentPropertyDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -3907,12 +3705,12 @@ namespace CIAO type_->container (this); } - ::CIAO::Config_Handlers::ComponentPropertyDescription& ComponentPropertyDescription:: - operator= (::CIAO::Config_Handlers::ComponentPropertyDescription const& s) + ComponentPropertyDescription& ComponentPropertyDescription:: + operator= (ComponentPropertyDescription const& s) { - name (s.name ()); + name (*s.name_); - type (s.type ()); + type (*s.type_); return *this; } @@ -3953,7 +3751,6 @@ namespace CIAO ComponentExternalPortEndpoint:: ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__) : - ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)), regulator__ () { @@ -3961,7 +3758,7 @@ namespace CIAO } ComponentExternalPortEndpoint:: - ComponentExternalPortEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s) + ComponentExternalPortEndpoint (ComponentExternalPortEndpoint const& s) : ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)), @@ -3970,10 +3767,10 @@ namespace CIAO portName_->container (this); } - ::CIAO::Config_Handlers::ComponentExternalPortEndpoint& ComponentExternalPortEndpoint:: - operator= (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& s) + ComponentExternalPortEndpoint& ComponentExternalPortEndpoint:: + operator= (ComponentExternalPortEndpoint const& s) { - portName (s.portName ()); + portName (*s.portName_); return *this; } @@ -4002,7 +3799,6 @@ namespace CIAO ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__, ::CIAO::Config_Handlers::IdRef const& instance__) : - ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)), kind_ (new ::CIAO::Config_Handlers::CCMComponentPortKind (kind__)), instance_ (new ::CIAO::Config_Handlers::IdRef (instance__)), @@ -4014,7 +3810,7 @@ namespace CIAO } PlanSubcomponentPortEndpoint:: - PlanSubcomponentPortEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s) + PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s) : ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)), @@ -4029,17 +3825,19 @@ namespace CIAO instance_->container (this); } - ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint:: - operator= (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& s) + PlanSubcomponentPortEndpoint& PlanSubcomponentPortEndpoint:: + operator= (PlanSubcomponentPortEndpoint const& s) { - portName (s.portName ()); + portName (*s.portName_); - if (s.provider_.get ()) provider (*(s.provider_)); - else provider_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.provider_.get ()) + provider (*(s.provider_)); + else + provider_.reset (0); - kind (s.kind ()); + kind (*s.kind_); - instance (s.instance ()); + instance (*s.instance_); return *this; } @@ -4124,7 +3922,6 @@ namespace CIAO ExternalReferenceEndpoint (::XMLSchema::string< ACE_TCHAR > const& location__, ::XMLSchema::boolean const& provider__) : - ::XSCRT::Type (), location_ (new ::XMLSchema::string< ACE_TCHAR > (location__)), provider_ (new ::XMLSchema::boolean (provider__)), regulator__ () @@ -4134,36 +3931,33 @@ namespace CIAO } ExternalReferenceEndpoint:: - ExternalReferenceEndpoint (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s) + ExternalReferenceEndpoint (ExternalReferenceEndpoint const& s) : ::XSCRT::Type (), location_ (new ::XMLSchema::string< ACE_TCHAR > (*s.location_)), provider_ (new ::XMLSchema::boolean (*s.provider_)), portName_ (s.portName_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.portName_) : 0), + supportedType_ (s.supportedType_), regulator__ () { location_->container (this); provider_->container (this); if (portName_.get ()) portName_->container (this); - { - for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i); - } } - ::CIAO::Config_Handlers::ExternalReferenceEndpoint& ExternalReferenceEndpoint:: - operator= (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& s) + ExternalReferenceEndpoint& ExternalReferenceEndpoint:: + operator= (ExternalReferenceEndpoint const& s) { - location (s.location ()); + location (*s.location_); - provider (s.provider ()); + provider (*s.provider_); - if (s.portName_.get ()) portName (*(s.portName_)); - else portName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.portName_.get ()) + portName (*(s.portName_)); + else + portName_.reset (0); - supportedType_.clear (); - { - for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i); - } + supportedType_ = s.supportedType_; return *this; } @@ -4253,7 +4047,7 @@ namespace CIAO } void ExternalReferenceEndpoint:: - add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e) + add_supportedType (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { supportedType_.push_back (e); } @@ -4273,7 +4067,6 @@ namespace CIAO ::XMLSchema::string< ACE_TCHAR > const& requirementName__, ::XMLSchema::string< ACE_TCHAR > const& resourceName__) : - ::XSCRT::Type (), targetName_ (new ::XMLSchema::string< ACE_TCHAR > (targetName__)), requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)), resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (resourceName__)), @@ -4285,35 +4078,30 @@ namespace CIAO } ConnectionResourceDeploymentDescription:: - ConnectionResourceDeploymentDescription (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s) + ConnectionResourceDeploymentDescription (ConnectionResourceDeploymentDescription const& s) : ::XSCRT::Type (), targetName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.targetName_)), requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requirementName_)), resourceName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceName_)), + property_ (s.property_), regulator__ () { targetName_->container (this); requirementName_->container (this); resourceName_->container (this); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription:: - operator= (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& s) + ConnectionResourceDeploymentDescription& ConnectionResourceDeploymentDescription:: + operator= (ConnectionResourceDeploymentDescription const& s) { - targetName (s.targetName ()); + targetName (*s.targetName_); - requirementName (s.requirementName ()); + requirementName (*s.requirementName_); - resourceName (s.resourceName ()); + resourceName (*s.resourceName_); - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -4388,7 +4176,7 @@ namespace CIAO } void ConnectionResourceDeploymentDescription:: - add_property (::CIAO::Config_Handlers::Property const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -4406,7 +4194,6 @@ namespace CIAO PlanConnectionDescription:: PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -4414,68 +4201,41 @@ namespace CIAO } PlanConnectionDescription:: - PlanConnectionDescription (::CIAO::Config_Handlers::PlanConnectionDescription const& s) + PlanConnectionDescription (PlanConnectionDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), source_ (s.source_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.source_) : 0), + deployRequirement_ (s.deployRequirement_), + externalEndpoint_ (s.externalEndpoint_), + internalEndpoint_ (s.internalEndpoint_), + externalReference_ (s.externalReference_), + deployedResource_ (s.deployedResource_), regulator__ () { name_->container (this); if (source_.get ()) source_->container (this); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } - - { - for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i); - } - - { - for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i); - } - - { - for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i); - } - - { - for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i); - } } - ::CIAO::Config_Handlers::PlanConnectionDescription& PlanConnectionDescription:: - operator= (::CIAO::Config_Handlers::PlanConnectionDescription const& s) + PlanConnectionDescription& PlanConnectionDescription:: + operator= (PlanConnectionDescription const& s) { - name (s.name ()); + name (*s.name_); - if (s.source_.get ()) source (*(s.source_)); - else source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.source_.get ()) + source (*(s.source_)); + else + source_.reset (0); - deployRequirement_.clear (); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } + deployRequirement_ = s.deployRequirement_; - externalEndpoint_.clear (); - { - for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i); - } + externalEndpoint_ = s.externalEndpoint_; - internalEndpoint_.clear (); - { - for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i); - } + internalEndpoint_ = s.internalEndpoint_; - externalReference_.clear (); - { - for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i); - } + externalReference_ = s.externalReference_; - deployedResource_.clear (); - { - for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i); - } + deployedResource_ = s.deployedResource_; return *this; } @@ -4551,7 +4311,7 @@ namespace CIAO } void PlanConnectionDescription:: - add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e) + add_deployRequirement (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > const& e) { deployRequirement_.push_back (e); } @@ -4589,7 +4349,7 @@ namespace CIAO } void PlanConnectionDescription:: - add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e) + add_externalEndpoint (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > const& e) { externalEndpoint_.push_back (e); } @@ -4627,7 +4387,7 @@ namespace CIAO } void PlanConnectionDescription:: - add_internalEndpoint (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint const& e) + add_internalEndpoint (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint, ACE_Null_Mutex > const& e) { internalEndpoint_.push_back (e); } @@ -4665,7 +4425,7 @@ namespace CIAO } void PlanConnectionDescription:: - add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e) + add_externalReference (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > const& e) { externalReference_.push_back (e); } @@ -4703,7 +4463,7 @@ namespace CIAO } void PlanConnectionDescription:: - add_deployedResource (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription const& e) + add_deployedResource (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription, ACE_Null_Mutex > const& e) { deployedResource_.push_back (e); } @@ -4721,7 +4481,6 @@ namespace CIAO ImplementationDependency:: ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__) : - ::XSCRT::Type (), requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)), regulator__ () { @@ -4729,7 +4488,7 @@ namespace CIAO } ImplementationDependency:: - ImplementationDependency (::CIAO::Config_Handlers::ImplementationDependency const& s) + ImplementationDependency (ImplementationDependency const& s) : ::XSCRT::Type (), requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.requiredType_)), @@ -4738,10 +4497,10 @@ namespace CIAO requiredType_->container (this); } - ::CIAO::Config_Handlers::ImplementationDependency& ImplementationDependency:: - operator= (::CIAO::Config_Handlers::ImplementationDependency const& s) + ImplementationDependency& ImplementationDependency:: + operator= (ImplementationDependency const& s) { - requiredType (s.requiredType ()); + requiredType (*s.requiredType_); return *this; } @@ -4768,7 +4527,6 @@ namespace CIAO Capability:: Capability (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -4776,36 +4534,25 @@ namespace CIAO } Capability:: - Capability (::CIAO::Config_Handlers::Capability const& s) + Capability (Capability const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), + resourceType_ (s.resourceType_), + property_ (s.property_), regulator__ () { name_->container (this); - { - for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i); - } - - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::Capability& Capability:: - operator= (::CIAO::Config_Handlers::Capability const& s) + Capability& Capability:: + operator= (Capability const& s) { - name (s.name ()); + name (*s.name_); - resourceType_.clear (); - { - for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i); - } + resourceType_ = s.resourceType_; - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -4852,7 +4599,7 @@ namespace CIAO } void Capability:: - add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e) + add_resourceType (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { resourceType_.push_back (e); } @@ -4890,7 +4637,7 @@ namespace CIAO } void Capability:: - add_property (::CIAO::Config_Handlers::SatisfierProperty const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -4909,7 +4656,6 @@ namespace CIAO ImplementationRequirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__, ::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () @@ -4919,7 +4665,7 @@ namespace CIAO } ImplementationRequirement:: - ImplementationRequirement (::CIAO::Config_Handlers::ImplementationRequirement const& s) + ImplementationRequirement (ImplementationRequirement const& s) : ::XSCRT::Type (), resourceUsage_ (s.resourceUsage_.get () ? new ::CIAO::Config_Handlers::ResourceUsageKind (*s.resourceUsage_) : 0), @@ -4927,6 +4673,7 @@ namespace CIAO componentPort_ (s.componentPort_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.componentPort_) : 0), resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (*s.resourceType_)), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), + property_ (s.property_), regulator__ () { if (resourceUsage_.get ()) resourceUsage_->container (this); @@ -4934,31 +4681,31 @@ namespace CIAO if (componentPort_.get ()) componentPort_->container (this); resourceType_->container (this); name_->container (this); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } } - ::CIAO::Config_Handlers::ImplementationRequirement& ImplementationRequirement:: - operator= (::CIAO::Config_Handlers::ImplementationRequirement const& s) + ImplementationRequirement& ImplementationRequirement:: + operator= (ImplementationRequirement const& s) { - if (s.resourceUsage_.get ()) resourceUsage (*(s.resourceUsage_)); - else resourceUsage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > (0); + if (s.resourceUsage_.get ()) + resourceUsage (*(s.resourceUsage_)); + else + resourceUsage_.reset (0); - if (s.resourcePort_.get ()) resourcePort (*(s.resourcePort_)); - else resourcePort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.resourcePort_.get ()) + resourcePort (*(s.resourcePort_)); + else + resourcePort_.reset (0); - if (s.componentPort_.get ()) componentPort (*(s.componentPort_)); - else componentPort_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.componentPort_.get ()) + componentPort (*(s.componentPort_)); + else + componentPort_.reset (0); - resourceType (s.resourceType ()); + resourceType (*s.resourceType_); - name (s.name ()); + name (*s.name_); - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; return *this; } @@ -5106,7 +4853,7 @@ namespace CIAO } void ImplementationRequirement:: - add_property (::CIAO::Config_Handlers::Property const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -5125,7 +4872,6 @@ namespace CIAO SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__, ::CIAO::Config_Handlers::IdRef const& instance__) : - ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)), instance_ (new ::CIAO::Config_Handlers::IdRef (instance__)), regulator__ () @@ -5135,7 +4881,7 @@ namespace CIAO } SubcomponentPortEndpoint:: - SubcomponentPortEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s) + SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s) : ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.portName_)), @@ -5146,12 +4892,12 @@ namespace CIAO instance_->container (this); } - ::CIAO::Config_Handlers::SubcomponentPortEndpoint& SubcomponentPortEndpoint:: - operator= (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& s) + SubcomponentPortEndpoint& SubcomponentPortEndpoint:: + operator= (SubcomponentPortEndpoint const& s) { - portName (s.portName ()); + portName (*s.portName_); - instance (s.instance ()); + instance (*s.instance_); return *this; } @@ -5192,7 +4938,6 @@ namespace CIAO AssemblyConnectionDescription:: AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -5200,54 +4945,31 @@ namespace CIAO } AssemblyConnectionDescription:: - AssemblyConnectionDescription (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s) + AssemblyConnectionDescription (AssemblyConnectionDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), + deployRequirement_ (s.deployRequirement_), + internalEndpoint_ (s.internalEndpoint_), + externalEndpoint_ (s.externalEndpoint_), + externalReference_ (s.externalReference_), regulator__ () { name_->container (this); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } - - { - for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i); - } - - { - for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i); - } - - { - for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i); - } } - ::CIAO::Config_Handlers::AssemblyConnectionDescription& AssemblyConnectionDescription:: - operator= (::CIAO::Config_Handlers::AssemblyConnectionDescription const& s) + AssemblyConnectionDescription& AssemblyConnectionDescription:: + operator= (AssemblyConnectionDescription const& s) { - name (s.name ()); + name (*s.name_); - deployRequirement_.clear (); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } + deployRequirement_ = s.deployRequirement_; - internalEndpoint_.clear (); - { - for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i); - } + internalEndpoint_ = s.internalEndpoint_; - externalEndpoint_.clear (); - { - for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i); - } + externalEndpoint_ = s.externalEndpoint_; - externalReference_.clear (); - { - for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i); - } + externalReference_ = s.externalReference_; return *this; } @@ -5294,7 +5016,7 @@ namespace CIAO } void AssemblyConnectionDescription:: - add_deployRequirement (::CIAO::Config_Handlers::Requirement const& e) + add_deployRequirement (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > const& e) { deployRequirement_.push_back (e); } @@ -5332,7 +5054,7 @@ namespace CIAO } void AssemblyConnectionDescription:: - add_internalEndpoint (::CIAO::Config_Handlers::SubcomponentPortEndpoint const& e) + add_internalEndpoint (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::SubcomponentPortEndpoint, ACE_Null_Mutex > const& e) { internalEndpoint_.push_back (e); } @@ -5370,7 +5092,7 @@ namespace CIAO } void AssemblyConnectionDescription:: - add_externalEndpoint (::CIAO::Config_Handlers::ComponentExternalPortEndpoint const& e) + add_externalEndpoint (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > const& e) { externalEndpoint_.push_back (e); } @@ -5408,7 +5130,7 @@ namespace CIAO } void AssemblyConnectionDescription:: - add_externalReference (::CIAO::Config_Handlers::ExternalReferenceEndpoint const& e) + add_externalReference (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > const& e) { externalReference_.push_back (e); } @@ -5454,7 +5176,6 @@ namespace CIAO PlanLocality (::CIAO::Config_Handlers::PlanLocalityKind const& constraint__, ::CIAO::Config_Handlers::IdRef const& constrainedInstance__) : - ::XSCRT::Type (), constraint_ (new ::CIAO::Config_Handlers::PlanLocalityKind (constraint__)), constrainedInstance_ (new ::CIAO::Config_Handlers::IdRef (constrainedInstance__)), regulator__ () @@ -5464,7 +5185,7 @@ namespace CIAO } PlanLocality:: - PlanLocality (::CIAO::Config_Handlers::PlanLocality const& s) + PlanLocality (PlanLocality const& s) : ::XSCRT::Type (), constraint_ (new ::CIAO::Config_Handlers::PlanLocalityKind (*s.constraint_)), @@ -5475,12 +5196,12 @@ namespace CIAO constrainedInstance_->container (this); } - ::CIAO::Config_Handlers::PlanLocality& PlanLocality:: - operator= (::CIAO::Config_Handlers::PlanLocality const& s) + PlanLocality& PlanLocality:: + operator= (PlanLocality const& s) { - constraint (s.constraint ()); + constraint (*s.constraint_); - constrainedInstance (s.constrainedInstance ()); + constrainedInstance (*s.constrainedInstance_); return *this; } @@ -5752,7 +5473,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -5778,91 +5499,91 @@ namespace CIAO if (n == "short") { - ::XMLSchema::short_ t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::short_, ACE_Null_Mutex > t (new ::XMLSchema::short_ (e)); add_short (t); } else if (n == "long") { - ::XMLSchema::int_ t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::int_, ACE_Null_Mutex > t (new ::XMLSchema::int_ (e)); add_long (t); } else if (n == "ushort") { - ::XMLSchema::unsignedShort t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedShort, ACE_Null_Mutex > t (new ::XMLSchema::unsignedShort (e)); add_ushort (t); } else if (n == "ulong") { - ::XMLSchema::unsignedInt t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedInt, ACE_Null_Mutex > t (new ::XMLSchema::unsignedInt (e)); add_ulong (t); } else if (n == "float") { - ::XMLSchema::float_ t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::float_, ACE_Null_Mutex > t (new ::XMLSchema::float_ (e)); add_float (t); } else if (n == "double") { - ::XMLSchema::double_ t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::double_, ACE_Null_Mutex > t (new ::XMLSchema::double_ (e)); add_double (t); } else if (n == "boolean") { - ::XMLSchema::boolean t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::boolean, ACE_Null_Mutex > t (new ::XMLSchema::boolean (e)); add_boolean (t); } else if (n == "octet") { - ::XMLSchema::unsignedByte t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedByte, ACE_Null_Mutex > t (new ::XMLSchema::unsignedByte (e)); add_octet (t); } else if (n == "enum") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_enum (t); } else if (n == "string") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_string (t); } else if (n == "longlong") { - ::XMLSchema::long_ t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::long_, ACE_Null_Mutex > t (new ::XMLSchema::long_ (e)); add_longlong (t); } else if (n == "ulonglong") { - ::XMLSchema::unsignedLong t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::unsignedLong, ACE_Null_Mutex > t (new ::XMLSchema::unsignedLong (e)); add_ulonglong (t); } else if (n == "longdouble") { - ::XMLSchema::double_ t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::double_, ACE_Null_Mutex > t (new ::XMLSchema::double_ (e)); add_longdouble (t); } else if (n == "element") { - ::CIAO::Config_Handlers::DataValue t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::DataValue, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::DataValue (e)); add_element (t); } else if (n == "member") { - ::CIAO::Config_Handlers::NamedValue t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::NamedValue, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::NamedValue (e)); add_member (t); } @@ -5940,7 +5661,7 @@ namespace CIAO else if (n == "member") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_member (t); } @@ -5979,7 +5700,7 @@ namespace CIAO else if (n == "member") { - ::CIAO::Config_Handlers::StructMemberType t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::StructMemberType, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::StructMemberType (e)); add_member (t); } @@ -6063,7 +5784,7 @@ namespace CIAO else if (n == "member") { - ::CIAO::Config_Handlers::ValueMemberType t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ValueMemberType, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ValueMemberType (e)); add_member (t); } @@ -6356,13 +6077,13 @@ namespace CIAO else if (n == "resourceType") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_resourceType (t); } else if (n == "property") { - ::CIAO::Config_Handlers::SatisfierProperty t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::SatisfierProperty (e)); add_property (t); } @@ -6401,7 +6122,7 @@ namespace CIAO else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_property (t); } @@ -6440,7 +6161,7 @@ namespace CIAO else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_property (t); } @@ -6473,7 +6194,7 @@ namespace CIAO else if (n == "source") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_source (t); } @@ -6485,25 +6206,25 @@ namespace CIAO else if (n == "location") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_location (t); } else if (n == "execParameter") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_execParameter (t); } else if (n == "deployRequirement") { - ::CIAO::Config_Handlers::Requirement t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Requirement (e)); add_deployRequirement (t); } else if (n == "deployedResource") { - ::CIAO::Config_Handlers::ResourceDeploymentDescription t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ResourceDeploymentDescription, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ResourceDeploymentDescription (e)); add_deployedResource (t); } @@ -6519,7 +6240,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -6551,25 +6272,25 @@ namespace CIAO else if (n == "source") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_source (t); } else if (n == "artifact") { - ::CIAO::Config_Handlers::IdRef t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::IdRef, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::IdRef (e)); add_artifact (t); } else if (n == "execParameter") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_execParameter (t); } else if (n == "deployRequirement") { - ::CIAO::Config_Handlers::Requirement t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Requirement (e)); add_deployRequirement (t); } @@ -6585,7 +6306,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -6670,7 +6391,7 @@ namespace CIAO else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_property (t); } @@ -6721,13 +6442,13 @@ namespace CIAO else if (n == "configProperty") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_configProperty (t); } else if (n == "deployedResource") { - ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e)); add_deployedResource (t); } @@ -6749,7 +6470,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -6831,7 +6552,7 @@ namespace CIAO else if (n == "supportedType") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_supportedType (t); } @@ -7011,7 +6732,7 @@ namespace CIAO else if (n == "supportedType") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_supportedType (t); } @@ -7056,7 +6777,7 @@ namespace CIAO else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_property (t); } @@ -7095,31 +6816,31 @@ namespace CIAO else if (n == "deployRequirement") { - ::CIAO::Config_Handlers::Requirement t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Requirement (e)); add_deployRequirement (t); } else if (n == "externalEndpoint") { - ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ComponentExternalPortEndpoint (e)); add_externalEndpoint (t); } else if (n == "internalEndpoint") { - ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint (e)); add_internalEndpoint (t); } else if (n == "externalReference") { - ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ExternalReferenceEndpoint (e)); add_externalReference (t); } else if (n == "deployedResource") { - ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription (e)); add_deployedResource (t); } @@ -7179,13 +6900,13 @@ namespace CIAO else if (n == "resourceType") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_resourceType (t); } else if (n == "property") { - ::CIAO::Config_Handlers::SatisfierProperty t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::SatisfierProperty, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::SatisfierProperty (e)); add_property (t); } @@ -7242,7 +6963,7 @@ namespace CIAO else if (n == "property") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_property (t); } @@ -7308,25 +7029,25 @@ namespace CIAO else if (n == "deployRequirement") { - ::CIAO::Config_Handlers::Requirement t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Requirement, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Requirement (e)); add_deployRequirement (t); } else if (n == "internalEndpoint") { - ::CIAO::Config_Handlers::SubcomponentPortEndpoint t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::SubcomponentPortEndpoint, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::SubcomponentPortEndpoint (e)); add_internalEndpoint (t); } else if (n == "externalEndpoint") { - ::CIAO::Config_Handlers::ComponentExternalPortEndpoint t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentExternalPortEndpoint, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ComponentExternalPortEndpoint (e)); add_externalEndpoint (t); } else if (n == "externalReference") { - ::CIAO::Config_Handlers::ExternalReferenceEndpoint t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ExternalReferenceEndpoint, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ExternalReferenceEndpoint (e)); add_externalReference (t); } @@ -7427,7 +7148,7 @@ namespace CIAO { IdRefTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (IdRef)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::IdRef)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7456,7 +7177,7 @@ namespace CIAO { DataTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (DataType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::DataType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7470,7 +7191,7 @@ namespace CIAO { DataValueTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (DataValue)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::DataValue)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7484,7 +7205,7 @@ namespace CIAO { AliasTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (AliasType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::AliasType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7498,7 +7219,7 @@ namespace CIAO { EnumTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (EnumType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::EnumType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7512,7 +7233,7 @@ namespace CIAO { StructTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (StructType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::StructType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7526,7 +7247,7 @@ namespace CIAO { StructMemberTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (StructMemberType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::StructMemberType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7540,7 +7261,7 @@ namespace CIAO { ValueTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ValueType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ValueType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7554,7 +7275,7 @@ namespace CIAO { ValueMemberTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ValueMemberType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ValueMemberType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7568,7 +7289,7 @@ namespace CIAO { NamedValueTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (NamedValue)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::NamedValue)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7582,7 +7303,7 @@ namespace CIAO { SequenceTypeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (SequenceType)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::SequenceType)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7596,7 +7317,7 @@ namespace CIAO { AnyTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Any)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Any)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7610,7 +7331,7 @@ namespace CIAO { PropertyTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Property)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Property)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7639,7 +7360,7 @@ namespace CIAO { SatisfierPropertyTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (SatisfierProperty)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::SatisfierProperty)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7653,7 +7374,7 @@ namespace CIAO { ResourceTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Resource)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Resource)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7667,7 +7388,7 @@ namespace CIAO { RequirementTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Requirement)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Requirement)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7681,7 +7402,7 @@ namespace CIAO { ResourceDeploymentDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ResourceDeploymentDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ResourceDeploymentDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7695,7 +7416,7 @@ namespace CIAO { ArtifactDeploymentDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ArtifactDeploymentDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ArtifactDeploymentDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7709,7 +7430,7 @@ namespace CIAO { MonolithicDeploymentDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (MonolithicDeploymentDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::MonolithicDeploymentDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7738,7 +7459,7 @@ namespace CIAO { InstanceResourceDeploymentDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (InstanceResourceDeploymentDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7752,7 +7473,7 @@ namespace CIAO { InstanceDeploymentDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (InstanceDeploymentDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::InstanceDeploymentDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7781,7 +7502,7 @@ namespace CIAO { ComponentPortDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentPortDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentPortDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7795,7 +7516,7 @@ namespace CIAO { ComponentPropertyDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentPropertyDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentPropertyDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7809,7 +7530,7 @@ namespace CIAO { ComponentExternalPortEndpointTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentExternalPortEndpoint)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentExternalPortEndpoint)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7823,7 +7544,7 @@ namespace CIAO { PlanSubcomponentPortEndpointTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (PlanSubcomponentPortEndpoint)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7837,7 +7558,7 @@ namespace CIAO { ExternalReferenceEndpointTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ExternalReferenceEndpoint)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ExternalReferenceEndpoint)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7851,7 +7572,7 @@ namespace CIAO { ConnectionResourceDeploymentDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ConnectionResourceDeploymentDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7865,7 +7586,7 @@ namespace CIAO { PlanConnectionDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (PlanConnectionDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::PlanConnectionDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7879,7 +7600,7 @@ namespace CIAO { ImplementationDependencyTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ImplementationDependency)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ImplementationDependency)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7893,7 +7614,7 @@ namespace CIAO { CapabilityTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Capability)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Capability)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7907,7 +7628,7 @@ namespace CIAO { ImplementationRequirementTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ImplementationRequirement)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ImplementationRequirement)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7921,7 +7642,7 @@ namespace CIAO { SubcomponentPortEndpointTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (SubcomponentPortEndpoint)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::SubcomponentPortEndpoint)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7935,7 +7656,7 @@ namespace CIAO { AssemblyConnectionDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (AssemblyConnectionDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::AssemblyConnectionDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -7964,7 +7685,7 @@ namespace CIAO { PlanLocalityTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (PlanLocality)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::PlanLocality)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -8092,8 +7813,8 @@ namespace CIAO else sequence_none (o); if (o.alias_p ()) alias (o); else alias_none (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -8112,8 +7833,8 @@ namespace CIAO else sequence_none (o); if (o.alias_p ()) alias (o); else alias_none (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -8250,24 +7971,24 @@ namespace CIAO } void DataType:: - xmi_id (Type& o) + id (Type& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void DataType:: - xmi_id (Type const& o) + id (Type const& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void DataType:: - xmi_id_none (Type&) + id_none (Type&) { } void DataType:: - xmi_id_none (Type const&) + id_none (Type const&) { } @@ -8344,14 +8065,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::short_iterator b (o.begin_short()), e (o.end_short()); + ::CIAO::Config_Handlers::DataValue::short_iterator b (o.begin_short()), e (o.end_short()); if (b != e) { short_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) short_next (o); } @@ -8366,14 +8087,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::short_const_iterator b (o.begin_short()), e (o.end_short()); + ::CIAO::Config_Handlers::DataValue::short_const_iterator b (o.begin_short()), e (o.end_short()); if (b != e) { short_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) short_next (o); } @@ -8428,14 +8149,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::long_iterator b (o.begin_long()), e (o.end_long()); + ::CIAO::Config_Handlers::DataValue::long_iterator b (o.begin_long()), e (o.end_long()); if (b != e) { long_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) long_next (o); } @@ -8450,14 +8171,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::long_const_iterator b (o.begin_long()), e (o.end_long()); + ::CIAO::Config_Handlers::DataValue::long_const_iterator b (o.begin_long()), e (o.end_long()); if (b != e) { long_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) long_next (o); } @@ -8512,14 +8233,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::ushort_iterator b (o.begin_ushort()), e (o.end_ushort()); + ::CIAO::Config_Handlers::DataValue::ushort_iterator b (o.begin_ushort()), e (o.end_ushort()); if (b != e) { ushort_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) ushort_next (o); } @@ -8534,14 +8255,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::ushort_const_iterator b (o.begin_ushort()), e (o.end_ushort()); + ::CIAO::Config_Handlers::DataValue::ushort_const_iterator b (o.begin_ushort()), e (o.end_ushort()); if (b != e) { ushort_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) ushort_next (o); } @@ -8596,14 +8317,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::ulong_iterator b (o.begin_ulong()), e (o.end_ulong()); + ::CIAO::Config_Handlers::DataValue::ulong_iterator b (o.begin_ulong()), e (o.end_ulong()); if (b != e) { ulong_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) ulong_next (o); } @@ -8618,14 +8339,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::ulong_const_iterator b (o.begin_ulong()), e (o.end_ulong()); + ::CIAO::Config_Handlers::DataValue::ulong_const_iterator b (o.begin_ulong()), e (o.end_ulong()); if (b != e) { ulong_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) ulong_next (o); } @@ -8680,14 +8401,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::float_iterator b (o.begin_float()), e (o.end_float()); + ::CIAO::Config_Handlers::DataValue::float_iterator b (o.begin_float()), e (o.end_float()); if (b != e) { float_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) float_next (o); } @@ -8702,14 +8423,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::float_const_iterator b (o.begin_float()), e (o.end_float()); + ::CIAO::Config_Handlers::DataValue::float_const_iterator b (o.begin_float()), e (o.end_float()); if (b != e) { float_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) float_next (o); } @@ -8764,14 +8485,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::double_iterator b (o.begin_double()), e (o.end_double()); + ::CIAO::Config_Handlers::DataValue::double_iterator b (o.begin_double()), e (o.end_double()); if (b != e) { double_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) double_next (o); } @@ -8786,14 +8507,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::double_const_iterator b (o.begin_double()), e (o.end_double()); + ::CIAO::Config_Handlers::DataValue::double_const_iterator b (o.begin_double()), e (o.end_double()); if (b != e) { double_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) double_next (o); } @@ -8848,14 +8569,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::boolean_iterator b (o.begin_boolean()), e (o.end_boolean()); + ::CIAO::Config_Handlers::DataValue::boolean_iterator b (o.begin_boolean()), e (o.end_boolean()); if (b != e) { boolean_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) boolean_next (o); } @@ -8870,14 +8591,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean()); + ::CIAO::Config_Handlers::DataValue::boolean_const_iterator b (o.begin_boolean()), e (o.end_boolean()); if (b != e) { boolean_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) boolean_next (o); } @@ -8932,14 +8653,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::octet_iterator b (o.begin_octet()), e (o.end_octet()); + ::CIAO::Config_Handlers::DataValue::octet_iterator b (o.begin_octet()), e (o.end_octet()); if (b != e) { octet_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) octet_next (o); } @@ -8954,14 +8675,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::octet_const_iterator b (o.begin_octet()), e (o.end_octet()); + ::CIAO::Config_Handlers::DataValue::octet_const_iterator b (o.begin_octet()), e (o.end_octet()); if (b != e) { octet_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) octet_next (o); } @@ -9016,14 +8737,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::enum_iterator b (o.begin_enum()), e (o.end_enum()); + ::CIAO::Config_Handlers::DataValue::enum_iterator b (o.begin_enum()), e (o.end_enum()); if (b != e) { enum_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) enum_next (o); } @@ -9038,14 +8759,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::enum_const_iterator b (o.begin_enum()), e (o.end_enum()); + ::CIAO::Config_Handlers::DataValue::enum_const_iterator b (o.begin_enum()), e (o.end_enum()); if (b != e) { enum_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) enum_next (o); } @@ -9100,14 +8821,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::string_iterator b (o.begin_string()), e (o.end_string()); + ::CIAO::Config_Handlers::DataValue::string_iterator b (o.begin_string()), e (o.end_string()); if (b != e) { string_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) string_next (o); } @@ -9122,14 +8843,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::string_const_iterator b (o.begin_string()), e (o.end_string()); + ::CIAO::Config_Handlers::DataValue::string_const_iterator b (o.begin_string()), e (o.end_string()); if (b != e) { string_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) string_next (o); } @@ -9184,14 +8905,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::longlong_iterator b (o.begin_longlong()), e (o.end_longlong()); + ::CIAO::Config_Handlers::DataValue::longlong_iterator b (o.begin_longlong()), e (o.end_longlong()); if (b != e) { longlong_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) longlong_next (o); } @@ -9206,14 +8927,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::longlong_const_iterator b (o.begin_longlong()), e (o.end_longlong()); + ::CIAO::Config_Handlers::DataValue::longlong_const_iterator b (o.begin_longlong()), e (o.end_longlong()); if (b != e) { longlong_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) longlong_next (o); } @@ -9268,14 +8989,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong()); + ::CIAO::Config_Handlers::DataValue::ulonglong_iterator b (o.begin_ulonglong()), e (o.end_ulonglong()); if (b != e) { ulonglong_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) ulonglong_next (o); } @@ -9290,14 +9011,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::ulonglong_const_iterator b (o.begin_ulonglong()), e (o.end_ulonglong()); + ::CIAO::Config_Handlers::DataValue::ulonglong_const_iterator b (o.begin_ulonglong()), e (o.end_ulonglong()); if (b != e) { ulonglong_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) ulonglong_next (o); } @@ -9352,14 +9073,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble()); + ::CIAO::Config_Handlers::DataValue::longdouble_iterator b (o.begin_longdouble()), e (o.end_longdouble()); if (b != e) { longdouble_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) longdouble_next (o); } @@ -9374,14 +9095,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble()); + ::CIAO::Config_Handlers::DataValue::longdouble_const_iterator b (o.begin_longdouble()), e (o.end_longdouble()); if (b != e) { longdouble_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) longdouble_next (o); } @@ -9436,14 +9157,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::element_iterator b (o.begin_element()), e (o.end_element()); + ::CIAO::Config_Handlers::DataValue::element_iterator b (o.begin_element()), e (o.end_element()); if (b != e) { element_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) element_next (o); } @@ -9458,14 +9179,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::element_const_iterator b (o.begin_element()), e (o.end_element()); + ::CIAO::Config_Handlers::DataValue::element_const_iterator b (o.begin_element()), e (o.end_element()); if (b != e) { element_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) element_next (o); } @@ -9520,14 +9241,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::member_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::DataValue::member_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -9542,14 +9263,14 @@ namespace CIAO { // VC6 anathema strikes again // - DataValue::Type::member_const_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::DataValue::member_const_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -9752,14 +9473,14 @@ namespace CIAO { // VC6 anathema strikes again // - EnumType::Type::member_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::EnumType::member_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -9772,14 +9493,14 @@ namespace CIAO { // VC6 anathema strikes again // - EnumType::Type::member_const_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::EnumType::member_const_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -9890,14 +9611,14 @@ namespace CIAO { // VC6 anathema strikes again // - StructType::Type::member_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::StructType::member_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -9912,14 +9633,14 @@ namespace CIAO { // VC6 anathema strikes again // - StructType::Type::member_const_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::StructType::member_const_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -10136,14 +9857,14 @@ namespace CIAO { // VC6 anathema strikes again // - ValueType::Type::member_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::ValueType::member_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -10158,14 +9879,14 @@ namespace CIAO { // VC6 anathema strikes again // - ValueType::Type::member_const_iterator b (o.begin_member()), e (o.end_member()); + ::CIAO::Config_Handlers::ValueType::member_const_iterator b (o.begin_member()), e (o.end_member()); if (b != e) { member_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) member_next (o); } @@ -10726,14 +10447,14 @@ namespace CIAO { // VC6 anathema strikes again // - Resource::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType()); + ::CIAO::Config_Handlers::Resource::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType()); if (b != e) { resourceType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) resourceType_next (o); } @@ -10746,14 +10467,14 @@ namespace CIAO { // VC6 anathema strikes again // - Resource::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType()); + ::CIAO::Config_Handlers::Resource::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType()); if (b != e) { resourceType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) resourceType_next (o); } @@ -10796,14 +10517,14 @@ namespace CIAO { // VC6 anathema strikes again // - Resource::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::Resource::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -10818,14 +10539,14 @@ namespace CIAO { // VC6 anathema strikes again // - Resource::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::Resource::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -10948,14 +10669,14 @@ namespace CIAO { // VC6 anathema strikes again // - Requirement::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::Requirement::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -10970,14 +10691,14 @@ namespace CIAO { // VC6 anathema strikes again // - Requirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::Requirement::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -11100,14 +10821,14 @@ namespace CIAO { // VC6 anathema strikes again // - ResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ResourceDeploymentDescription::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -11122,14 +10843,14 @@ namespace CIAO { // VC6 anathema strikes again // - ResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ResourceDeploymentDescription::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -11204,8 +10925,8 @@ namespace CIAO execParameter (o); deployRequirement (o); deployedResource (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -11220,8 +10941,8 @@ namespace CIAO execParameter (o); deployRequirement (o); deployedResource (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -11252,19 +10973,21 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::source_iterator b (o.begin_source()), e (o.end_source()); if (b != e) { source_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) source_next (o); } source_post (o); } + + else source_none (o); } void ArtifactDeploymentDescription:: @@ -11272,19 +10995,21 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::source_const_iterator b (o.begin_source()), e (o.end_source()); if (b != e) { source_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) source_next (o); } source_post (o); } + + else source_none (o); } void ArtifactDeploymentDescription:: @@ -11318,6 +11043,16 @@ namespace CIAO } void ArtifactDeploymentDescription:: + source_none (Type&) + { + } + + void ArtifactDeploymentDescription:: + source_none (Type const&) + { + } + + void ArtifactDeploymentDescription:: node (Type& o) { dispatch (o.node ()); @@ -11334,19 +11069,21 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::location_iterator b (o.begin_location()), e (o.end_location()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::location_iterator b (o.begin_location()), e (o.end_location()); if (b != e) { location_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) location_next (o); } location_post (o); } + + else location_none (o); } void ArtifactDeploymentDescription:: @@ -11354,19 +11091,21 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::location_const_iterator b (o.begin_location()), e (o.end_location()); if (b != e) { location_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) location_next (o); } location_post (o); } + + else location_none (o); } void ArtifactDeploymentDescription:: @@ -11400,18 +11139,28 @@ namespace CIAO } void ArtifactDeploymentDescription:: + location_none (Type&) + { + } + + void ArtifactDeploymentDescription:: + location_none (Type const&) + { + } + + void ArtifactDeploymentDescription:: execParameter (Type& o) { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter()); if (b != e) { execParameter_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) execParameter_next (o); } @@ -11426,14 +11175,14 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter()); if (b != e) { execParameter_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) execParameter_next (o); } @@ -11488,14 +11237,14 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -11510,14 +11259,14 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -11572,14 +11321,14 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); if (b != e) { deployedResource_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployedResource_next (o); } @@ -11594,14 +11343,14 @@ namespace CIAO { // VC6 anathema strikes again // - ArtifactDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); + ::CIAO::Config_Handlers::ArtifactDeploymentDescription::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); if (b != e) { deployedResource_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployedResource_next (o); } @@ -11652,24 +11401,24 @@ namespace CIAO } void ArtifactDeploymentDescription:: - xmi_id (Type& o) + id (Type& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void ArtifactDeploymentDescription:: - xmi_id (Type const& o) + id (Type const& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void ArtifactDeploymentDescription:: - xmi_id_none (Type&) + id_none (Type&) { } void ArtifactDeploymentDescription:: - xmi_id_none (Type const&) + id_none (Type const&) { } @@ -11696,8 +11445,8 @@ namespace CIAO artifact (o); execParameter (o); deployRequirement (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -11710,8 +11459,8 @@ namespace CIAO artifact (o); execParameter (o); deployRequirement (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -11742,19 +11491,21 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::source_iterator b (o.begin_source()), e (o.end_source()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::source_iterator b (o.begin_source()), e (o.end_source()); if (b != e) { source_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) source_next (o); } source_post (o); } + + else source_none (o); } void MonolithicDeploymentDescription:: @@ -11762,19 +11513,21 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::source_const_iterator b (o.begin_source()), e (o.end_source()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::source_const_iterator b (o.begin_source()), e (o.end_source()); if (b != e) { source_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) source_next (o); } source_post (o); } + + else source_none (o); } void MonolithicDeploymentDescription:: @@ -11808,23 +11561,35 @@ namespace CIAO } void MonolithicDeploymentDescription:: + source_none (Type&) + { + } + + void MonolithicDeploymentDescription:: + source_none (Type const&) + { + } + + void MonolithicDeploymentDescription:: artifact (Type& o) { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::artifact_iterator b (o.begin_artifact()), e (o.end_artifact()); if (b != e) { artifact_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) artifact_next (o); } artifact_post (o); } + + else artifact_none (o); } void MonolithicDeploymentDescription:: @@ -11832,19 +11597,21 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact()); if (b != e) { artifact_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) artifact_next (o); } artifact_post (o); } + + else artifact_none (o); } void MonolithicDeploymentDescription:: @@ -11878,18 +11645,28 @@ namespace CIAO } void MonolithicDeploymentDescription:: + artifact_none (Type&) + { + } + + void MonolithicDeploymentDescription:: + artifact_none (Type const&) + { + } + + void MonolithicDeploymentDescription:: execParameter (Type& o) { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter()); if (b != e) { execParameter_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) execParameter_next (o); } @@ -11904,14 +11681,14 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter()); if (b != e) { execParameter_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) execParameter_next (o); } @@ -11966,14 +11743,14 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -11988,14 +11765,14 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicDeploymentDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::MonolithicDeploymentDescription::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -12046,24 +11823,24 @@ namespace CIAO } void MonolithicDeploymentDescription:: - xmi_id (Type& o) + id (Type& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void MonolithicDeploymentDescription:: - xmi_id (Type const& o) + id (Type const& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void MonolithicDeploymentDescription:: - xmi_id_none (Type&) + id_none (Type&) { } void MonolithicDeploymentDescription:: - xmi_id_none (Type const&) + id_none (Type const&) { } @@ -12154,14 +11931,14 @@ namespace CIAO { // VC6 anathema strikes again // - InstanceResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -12176,14 +11953,14 @@ namespace CIAO { // VC6 anathema strikes again // - InstanceResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -12259,8 +12036,8 @@ namespace CIAO deployedResource (o); if (o.deployedSharedResource_p ()) deployedSharedResource (o); else deployedSharedResource_none (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -12276,8 +12053,8 @@ namespace CIAO deployedResource (o); if (o.deployedSharedResource_p ()) deployedSharedResource (o); else deployedSharedResource_none (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); post (o); } @@ -12344,14 +12121,14 @@ namespace CIAO { // VC6 anathema strikes again // - InstanceDeploymentDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::InstanceDeploymentDescription::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { configProperty_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) configProperty_next (o); } @@ -12366,14 +12143,14 @@ namespace CIAO { // VC6 anathema strikes again // - InstanceDeploymentDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::InstanceDeploymentDescription::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { configProperty_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) configProperty_next (o); } @@ -12428,14 +12205,14 @@ namespace CIAO { // VC6 anathema strikes again // - InstanceDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); + ::CIAO::Config_Handlers::InstanceDeploymentDescription::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); if (b != e) { deployedResource_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployedResource_next (o); } @@ -12450,14 +12227,14 @@ namespace CIAO { // VC6 anathema strikes again // - InstanceDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); + ::CIAO::Config_Handlers::InstanceDeploymentDescription::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); if (b != e) { deployedResource_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployedResource_next (o); } @@ -12530,24 +12307,24 @@ namespace CIAO } void InstanceDeploymentDescription:: - xmi_id (Type& o) + id (Type& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void InstanceDeploymentDescription:: - xmi_id (Type const& o) + id (Type const& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void InstanceDeploymentDescription:: - xmi_id_none (Type&) + id_none (Type&) { } void InstanceDeploymentDescription:: - xmi_id_none (Type const&) + id_none (Type const&) { } @@ -12646,14 +12423,14 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPortDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType()); + ::CIAO::Config_Handlers::ComponentPortDescription::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType()); if (b != e) { supportedType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) supportedType_next (o); } @@ -12668,14 +12445,14 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPortDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType()); + ::CIAO::Config_Handlers::ComponentPortDescription::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType()); if (b != e) { supportedType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) supportedType_next (o); } @@ -13108,19 +12885,21 @@ namespace CIAO { // VC6 anathema strikes again // - ExternalReferenceEndpoint::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType()); + ::CIAO::Config_Handlers::ExternalReferenceEndpoint::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType()); if (b != e) { supportedType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) supportedType_next (o); } supportedType_post (o); } + + else supportedType_none (o); } void ExternalReferenceEndpoint:: @@ -13128,19 +12907,21 @@ namespace CIAO { // VC6 anathema strikes again // - ExternalReferenceEndpoint::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType()); + ::CIAO::Config_Handlers::ExternalReferenceEndpoint::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType()); if (b != e) { supportedType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) supportedType_next (o); } supportedType_post (o); } + + else supportedType_none (o); } void ExternalReferenceEndpoint:: @@ -13174,6 +12955,16 @@ namespace CIAO } void ExternalReferenceEndpoint:: + supportedType_none (Type&) + { + } + + void ExternalReferenceEndpoint:: + supportedType_none (Type const&) + { + } + + void ExternalReferenceEndpoint:: post (Type&) { } @@ -13260,14 +13051,14 @@ namespace CIAO { // VC6 anathema strikes again // - ConnectionResourceDeploymentDescription::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -13282,14 +13073,14 @@ namespace CIAO { // VC6 anathema strikes again // - ConnectionResourceDeploymentDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -13432,14 +13223,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::PlanConnectionDescription::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -13454,14 +13245,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::PlanConnectionDescription::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -13516,14 +13307,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); + ::CIAO::Config_Handlers::PlanConnectionDescription::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); if (b != e) { externalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalEndpoint_next (o); } @@ -13538,14 +13329,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); + ::CIAO::Config_Handlers::PlanConnectionDescription::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); if (b != e) { externalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalEndpoint_next (o); } @@ -13600,14 +13391,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); + ::CIAO::Config_Handlers::PlanConnectionDescription::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); if (b != e) { internalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) internalEndpoint_next (o); } @@ -13622,14 +13413,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); + ::CIAO::Config_Handlers::PlanConnectionDescription::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); if (b != e) { internalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) internalEndpoint_next (o); } @@ -13684,14 +13475,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference()); + ::CIAO::Config_Handlers::PlanConnectionDescription::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference()); if (b != e) { externalReference_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalReference_next (o); } @@ -13706,14 +13497,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference()); + ::CIAO::Config_Handlers::PlanConnectionDescription::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference()); if (b != e) { externalReference_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalReference_next (o); } @@ -13768,14 +13559,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); + ::CIAO::Config_Handlers::PlanConnectionDescription::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); if (b != e) { deployedResource_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployedResource_next (o); } @@ -13790,14 +13581,14 @@ namespace CIAO { // VC6 anathema strikes again // - PlanConnectionDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); + ::CIAO::Config_Handlers::PlanConnectionDescription::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource()); if (b != e) { deployedResource_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployedResource_next (o); } @@ -13960,19 +13751,21 @@ namespace CIAO { // VC6 anathema strikes again // - Capability::Type::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType()); + ::CIAO::Config_Handlers::Capability::resourceType_iterator b (o.begin_resourceType()), e (o.end_resourceType()); if (b != e) { resourceType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) resourceType_next (o); } resourceType_post (o); } + + else resourceType_none (o); } void Capability:: @@ -13980,19 +13773,21 @@ namespace CIAO { // VC6 anathema strikes again // - Capability::Type::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType()); + ::CIAO::Config_Handlers::Capability::resourceType_const_iterator b (o.begin_resourceType()), e (o.end_resourceType()); if (b != e) { resourceType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) resourceType_next (o); } resourceType_post (o); } + + else resourceType_none (o); } void Capability:: @@ -14026,18 +13821,28 @@ namespace CIAO } void Capability:: + resourceType_none (Type&) + { + } + + void Capability:: + resourceType_none (Type const&) + { + } + + void Capability:: property (Type& o) { // VC6 anathema strikes again // - Capability::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::Capability::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -14052,14 +13857,14 @@ namespace CIAO { // VC6 anathema strikes again // - Capability::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::Capability::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -14260,14 +14065,14 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationRequirement::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ImplementationRequirement::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -14282,14 +14087,14 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationRequirement::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ImplementationRequirement::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -14470,14 +14275,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -14492,14 +14297,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { deployRequirement_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) deployRequirement_next (o); } @@ -14554,14 +14359,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::internalEndpoint_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); if (b != e) { internalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) internalEndpoint_next (o); } @@ -14576,14 +14381,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::internalEndpoint_const_iterator b (o.begin_internalEndpoint()), e (o.end_internalEndpoint()); if (b != e) { internalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) internalEndpoint_next (o); } @@ -14638,14 +14443,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::externalEndpoint_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); if (b != e) { externalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalEndpoint_next (o); } @@ -14660,14 +14465,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::externalEndpoint_const_iterator b (o.begin_externalEndpoint()), e (o.end_externalEndpoint()); if (b != e) { externalEndpoint_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalEndpoint_next (o); } @@ -14722,14 +14527,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::externalReference_iterator b (o.begin_externalReference()), e (o.end_externalReference()); if (b != e) { externalReference_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalReference_next (o); } @@ -14744,14 +14549,14 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyConnectionDescription::Type::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference()); + ::CIAO::Config_Handlers::AssemblyConnectionDescription::externalReference_const_iterator b (o.begin_externalReference()), e (o.end_externalReference()); if (b != e) { externalReference_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) externalReference_next (o); } @@ -15067,11 +14872,11 @@ namespace CIAO } void DataType:: - xmi_id (Type const& o) + id (Type const& o) { ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ()); attr_ (&a); - Traversal::DataType::xmi_id (o); + Traversal::DataType::id (o); attr_ (0); } @@ -16246,11 +16051,11 @@ namespace CIAO } void ArtifactDeploymentDescription:: - xmi_id (Type const& o) + id (Type const& o) { ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ()); attr_ (&a); - Traversal::ArtifactDeploymentDescription::xmi_id (o); + Traversal::ArtifactDeploymentDescription::id (o); attr_ (0); } @@ -16360,11 +16165,11 @@ namespace CIAO } void MonolithicDeploymentDescription:: - xmi_id (Type const& o) + id (Type const& o) { ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ()); attr_ (&a); - Traversal::MonolithicDeploymentDescription::xmi_id (o); + Traversal::MonolithicDeploymentDescription::id (o); attr_ (0); } @@ -16572,11 +16377,11 @@ namespace CIAO } void InstanceDeploymentDescription:: - xmi_id (Type const& o) + id (Type const& o) { ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/Deployment", "", top_ ()); attr_ (&a); - Traversal::InstanceDeploymentDescription::xmi_id (o); + Traversal::InstanceDeploymentDescription::id (o); attr_ (0); } |