diff options
author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-04-29 02:28:25 +0000 |
---|---|---|
committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-04-29 02:28:25 +0000 |
commit | 510375000ccda4aa295413f817e75ac6c4daa30f (patch) | |
tree | 3967464a0637e08f8b26560ebf1330ca219ab971 /CIAO/tools/Config_Handlers | |
parent | dfa445f59a1d4034db8d1ac262701bf67580a965 (diff) | |
download | ATCD-510375000ccda4aa295413f817e75ac6c4daa30f.tar.gz |
ChangeLogTag: Wed Apr 29 02:27:23 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'CIAO/tools/Config_Handlers')
32 files changed, 2646 insertions, 3849 deletions
diff --git a/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/CIAO/tools/Config_Handlers/ADD_Handler.cpp index 1b898b603d2..d44ef319ca5 100644 --- a/CIAO/tools/Config_Handlers/ADD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/ADD_Handler.cpp @@ -87,9 +87,9 @@ namespace CIAO dest.execParameter[len++]); } - if (src.xmi_id_p ()) + if (src.id_p ()) { - ACE_CString cstr (src.xmi_id ().c_str ()); + ACE_CString cstr (src.id ().c_str ()); ADD_Handler::IDREF.bind_ref (cstr,pos); } @@ -169,7 +169,7 @@ namespace CIAO // Bind the ref and set it in the IDD ADD_Handler::IDREF.bind_next_available (add_id); - add.xmi_id (xml_id); + add.id (xml_id); return add; } diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp index a000d175f0f..2594b750472 100644 --- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp +++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp @@ -32,8 +32,8 @@ namespace CIAO } IdRef:: - IdRef (::CIAO::Config_Handlers::IdRef const& s) - : XSCRT::Type (), + IdRef (IdRef const& s) + : 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 +42,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 +167,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 +176,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 +185,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 +387,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 +426,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 +495,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) { - short_.push_back (e); + short__.push_back (e); } size_t DataValue:: count_short(void) const { - return short_.size (); + return short__.size (); } // DataValue @@ -613,37 +533,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) { - long_.push_back (e); + long__.push_back (e); } size_t DataValue:: count_long(void) const { - return long_.size (); + return long__.size (); } // DataValue @@ -727,37 +647,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) { - float_.push_back (e); + float__.push_back (e); } size_t DataValue:: count_float(void) const { - return float_.size (); + return float__.size (); } // DataValue @@ -765,37 +685,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) { - double_.push_back (e); + double__.push_back (e); } size_t DataValue:: count_double(void) const { - return double_.size (); + return double__.size (); } // DataValue @@ -879,37 +799,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) { - enum_.push_back (e); + enum__.push_back (e); } size_t DataValue:: count_enum(void) const { - return enum_.size (); + return enum__.size (); } // DataValue @@ -1149,7 +1069,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 +1080,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 +1093,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 +1154,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< ::XMLSchema::string< ACE_TCHAR > > 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 +1167,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; } @@ -1351,7 +1266,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 +1275,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; } @@ -1465,7 +1374,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 +1383,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 +1394,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 +1443,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 +1456,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; } @@ -1690,7 +1592,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 +1603,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 +1616,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 +1679,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 +1688,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 +1699,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 +1745,6 @@ namespace CIAO SequenceType:: SequenceType (::CIAO::Config_Handlers::DataType const& elementType__) : - ::XSCRT::Type (), elementType_ (new ::CIAO::Config_Handlers::DataType (elementType__)), regulator__ () { @@ -1853,7 +1752,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 +1763,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 +1828,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 +1837,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 +1848,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 +1895,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 +1904,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 +1915,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 +1991,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 +2004,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 +2019,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 +2095,36 @@ namespace CIAO // Resource:: - Resource (::XMLSchema::string< ACE_TCHAR > const& name__) + Resource (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ::XMLSchema::string< ACE_TCHAR > > 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; } @@ -2340,7 +2228,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 +2237,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; } @@ -2454,7 +2336,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 +2345,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; } @@ -2568,7 +2444,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 +2453,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; } @@ -2871,35 +2716,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 +2755,6 @@ namespace CIAO MonolithicDeploymentDescription:: MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -2918,60 +2762,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; } @@ -3146,35 +2966,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 +3034,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 +3045,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; } @@ -3350,7 +3164,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 +3177,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; } @@ -3586,35 +3389,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 +3460,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 +3477,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 +3492,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 +3499,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; } @@ -3886,7 +3684,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 +3693,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 +3704,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 +3750,6 @@ namespace CIAO ComponentExternalPortEndpoint:: ComponentExternalPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__) : - ::XSCRT::Type (), portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)), regulator__ () { @@ -3961,7 +3757,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 +3766,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 +3798,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 +3809,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 +3824,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 +3921,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 +3930,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; } @@ -4273,7 +4066,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 +4077,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; } @@ -4406,7 +4193,6 @@ namespace CIAO PlanConnectionDescription:: PlanConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -4414,68 +4200,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; } @@ -4721,7 +4480,6 @@ namespace CIAO ImplementationDependency:: ImplementationDependency (::XMLSchema::string< ACE_TCHAR > const& requiredType__) : - ::XSCRT::Type (), requiredType_ (new ::XMLSchema::string< ACE_TCHAR > (requiredType__)), regulator__ () { @@ -4729,7 +4487,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 +4496,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 +4526,6 @@ namespace CIAO Capability:: Capability (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -4776,36 +4533,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; } @@ -4909,7 +4655,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 +4664,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 +4672,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 +4680,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; } @@ -5125,7 +4871,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 +4880,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 +4891,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 +4937,6 @@ namespace CIAO AssemblyConnectionDescription:: AssemblyConnectionDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -5200,54 +4944,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; } @@ -5454,7 +5175,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 +5184,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 +5195,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 +5472,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -6519,7 +6239,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -6585,7 +6305,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -6749,7 +6469,7 @@ namespace CIAO if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else @@ -7427,7 +7147,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 +7176,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 +7190,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 +7204,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 +7218,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 +7232,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 +7246,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 +7260,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 +7274,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 +7288,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 +7302,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 +7316,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 +7330,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 +7359,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 +7373,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 +7387,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 +7401,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 +7415,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 +7429,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 +7458,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 +7472,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 +7501,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 +7515,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 +7529,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 +7543,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 +7557,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 +7571,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 +7585,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 +7599,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 +7613,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 +7627,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 +7641,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 +7655,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 +7684,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 +7812,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 +7832,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 +7970,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,7 +8064,7 @@ 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) { @@ -8366,7 +8086,7 @@ 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) { @@ -8428,7 +8148,7 @@ 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) { @@ -8450,7 +8170,7 @@ 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) { @@ -8512,7 +8232,7 @@ 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) { @@ -8534,7 +8254,7 @@ 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) { @@ -8596,7 +8316,7 @@ 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) { @@ -8618,7 +8338,7 @@ 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) { @@ -8680,7 +8400,7 @@ 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) { @@ -8702,7 +8422,7 @@ 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) { @@ -8764,7 +8484,7 @@ 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) { @@ -8786,7 +8506,7 @@ 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) { @@ -8848,7 +8568,7 @@ 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) { @@ -8870,7 +8590,7 @@ 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) { @@ -8932,7 +8652,7 @@ 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) { @@ -8954,7 +8674,7 @@ 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) { @@ -9016,7 +8736,7 @@ 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) { @@ -9038,7 +8758,7 @@ 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) { @@ -9100,7 +8820,7 @@ 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) { @@ -9122,7 +8842,7 @@ 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) { @@ -9184,7 +8904,7 @@ 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) { @@ -9206,7 +8926,7 @@ 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) { @@ -9268,7 +8988,7 @@ 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) { @@ -9290,7 +9010,7 @@ 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) { @@ -9352,7 +9072,7 @@ 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) { @@ -9374,7 +9094,7 @@ 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) { @@ -9436,7 +9156,7 @@ 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) { @@ -9458,7 +9178,7 @@ 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) { @@ -9520,7 +9240,7 @@ 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) { @@ -9542,7 +9262,7 @@ 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) { @@ -9752,7 +9472,7 @@ 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) { @@ -9772,7 +9492,7 @@ 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) { @@ -9890,7 +9610,7 @@ 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) { @@ -9912,7 +9632,7 @@ 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) { @@ -10136,7 +9856,7 @@ 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) { @@ -10158,7 +9878,7 @@ 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) { @@ -10726,7 +10446,7 @@ 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) { @@ -10746,7 +10466,7 @@ 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) { @@ -10796,7 +10516,7 @@ 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) { @@ -10818,7 +10538,7 @@ 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) { @@ -10948,7 +10668,7 @@ 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) { @@ -10970,7 +10690,7 @@ 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) { @@ -11100,7 +10820,7 @@ 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) { @@ -11122,7 +10842,7 @@ 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) { @@ -11204,8 +10924,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 +10940,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,7 +10972,7 @@ 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) { @@ -11265,6 +10985,8 @@ namespace CIAO source_post (o); } + + else source_none (o); } void ArtifactDeploymentDescription:: @@ -11272,7 +10994,7 @@ 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) { @@ -11285,6 +11007,8 @@ namespace CIAO source_post (o); } + + else source_none (o); } void ArtifactDeploymentDescription:: @@ -11318,6 +11042,16 @@ namespace CIAO } void ArtifactDeploymentDescription:: + source_none (Type&) + { + } + + void ArtifactDeploymentDescription:: + source_none (Type const&) + { + } + + void ArtifactDeploymentDescription:: node (Type& o) { dispatch (o.node ()); @@ -11334,7 +11068,7 @@ 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) { @@ -11347,6 +11081,8 @@ namespace CIAO location_post (o); } + + else location_none (o); } void ArtifactDeploymentDescription:: @@ -11354,7 +11090,7 @@ 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) { @@ -11367,6 +11103,8 @@ namespace CIAO location_post (o); } + + else location_none (o); } void ArtifactDeploymentDescription:: @@ -11400,11 +11138,21 @@ 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) { @@ -11426,7 +11174,7 @@ 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) { @@ -11488,7 +11236,7 @@ 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) { @@ -11510,7 +11258,7 @@ 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) { @@ -11572,7 +11320,7 @@ 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) { @@ -11594,7 +11342,7 @@ 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) { @@ -11652,24 +11400,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 +11444,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 +11458,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,7 +11490,7 @@ 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) { @@ -11755,6 +11503,8 @@ namespace CIAO source_post (o); } + + else source_none (o); } void MonolithicDeploymentDescription:: @@ -11762,7 +11512,7 @@ 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) { @@ -11775,6 +11525,8 @@ namespace CIAO source_post (o); } + + else source_none (o); } void MonolithicDeploymentDescription:: @@ -11808,11 +11560,21 @@ 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) { @@ -11825,6 +11587,8 @@ namespace CIAO artifact_post (o); } + + else artifact_none (o); } void MonolithicDeploymentDescription:: @@ -11832,7 +11596,7 @@ 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) { @@ -11845,6 +11609,8 @@ namespace CIAO artifact_post (o); } + + else artifact_none (o); } void MonolithicDeploymentDescription:: @@ -11878,11 +11644,21 @@ 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) { @@ -11904,7 +11680,7 @@ 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) { @@ -11966,7 +11742,7 @@ 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) { @@ -11988,7 +11764,7 @@ 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) { @@ -12046,24 +11822,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,7 +11930,7 @@ 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) { @@ -12176,7 +11952,7 @@ 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) { @@ -12259,8 +12035,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 +12052,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,7 +12120,7 @@ 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) { @@ -12366,7 +12142,7 @@ 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) { @@ -12428,7 +12204,7 @@ 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) { @@ -12450,7 +12226,7 @@ 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) { @@ -12530,24 +12306,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,7 +12422,7 @@ 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) { @@ -12668,7 +12444,7 @@ 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) { @@ -13108,7 +12884,7 @@ 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) { @@ -13121,6 +12897,8 @@ namespace CIAO supportedType_post (o); } + + else supportedType_none (o); } void ExternalReferenceEndpoint:: @@ -13128,7 +12906,7 @@ 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) { @@ -13141,6 +12919,8 @@ namespace CIAO supportedType_post (o); } + + else supportedType_none (o); } void ExternalReferenceEndpoint:: @@ -13174,6 +12954,16 @@ namespace CIAO } void ExternalReferenceEndpoint:: + supportedType_none (Type&) + { + } + + void ExternalReferenceEndpoint:: + supportedType_none (Type const&) + { + } + + void ExternalReferenceEndpoint:: post (Type&) { } @@ -13260,7 +13050,7 @@ 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) { @@ -13282,7 +13072,7 @@ 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) { @@ -13432,7 +13222,7 @@ 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) { @@ -13454,7 +13244,7 @@ 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) { @@ -13516,7 +13306,7 @@ 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) { @@ -13538,7 +13328,7 @@ 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) { @@ -13600,7 +13390,7 @@ 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) { @@ -13622,7 +13412,7 @@ 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) { @@ -13684,7 +13474,7 @@ 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) { @@ -13706,7 +13496,7 @@ 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) { @@ -13768,7 +13558,7 @@ 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) { @@ -13790,7 +13580,7 @@ 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) { @@ -13960,7 +13750,7 @@ 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) { @@ -13973,6 +13763,8 @@ namespace CIAO resourceType_post (o); } + + else resourceType_none (o); } void Capability:: @@ -13980,7 +13772,7 @@ 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) { @@ -13993,6 +13785,8 @@ namespace CIAO resourceType_post (o); } + + else resourceType_none (o); } void Capability:: @@ -14026,11 +13820,21 @@ 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) { @@ -14052,7 +13856,7 @@ 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) { @@ -14260,7 +14064,7 @@ 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) { @@ -14282,7 +14086,7 @@ 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) { @@ -14470,7 +14274,7 @@ 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) { @@ -14492,7 +14296,7 @@ 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) { @@ -14554,7 +14358,7 @@ 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) { @@ -14576,7 +14380,7 @@ 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) { @@ -14638,7 +14442,7 @@ 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) { @@ -14660,7 +14464,7 @@ 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) { @@ -14722,7 +14526,7 @@ 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) { @@ -14744,7 +14548,7 @@ 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) { @@ -15067,11 +14871,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 +16050,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 +16164,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 +16376,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); } diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp index c31049cb7f1..c4e537d03ff 100644 --- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp +++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp @@ -82,7 +82,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // href - // + // public: bool href_p () const; ::XMLSchema::string< ACE_TCHAR > const& href () const; @@ -93,7 +93,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > href_; // idref - // + // public: bool idref_p () const; ::XMLSchema::IDREF< ACE_TCHAR > const& idref () const; @@ -170,10 +170,10 @@ namespace CIAO Value integral () const; - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator== (TCKind const& a, TCKind const& b); - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator!= (TCKind const& a, TCKind const& b); private: @@ -192,7 +192,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // kind - // + // public: ::CIAO::Config_Handlers::TCKind const& kind () const; void kind (::CIAO::Config_Handlers::TCKind const& ); @@ -201,7 +201,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_; // enum - // + // public: bool enum_p () const; ::CIAO::Config_Handlers::EnumType const& enum_ () const; @@ -211,7 +211,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::EnumType > enum__; // struct - // + // public: bool struct_p () const; ::CIAO::Config_Handlers::StructType const& struct_ () const; @@ -221,7 +221,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::StructType > struct__; // value - // + // public: bool value_p () const; ::CIAO::Config_Handlers::ValueType const& value () const; @@ -231,7 +231,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::ValueType > value_; // sequence - // + // public: bool sequence_p () const; ::CIAO::Config_Handlers::SequenceType const& sequence () const; @@ -241,7 +241,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SequenceType > sequence_; // alias - // + // public: bool alias_p () const; ::CIAO::Config_Handlers::AliasType const& alias () const; @@ -250,16 +250,16 @@ namespace CIAO protected: ::std::auto_ptr< ::CIAO::Config_Handlers::AliasType > alias_; - // xmi_id - // + // id + // public: - bool xmi_id_p () const; - ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const; - ::XMLSchema::ID< ACE_TCHAR >& xmi_id (); - void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& ); + bool id_p () const; + ::XMLSchema::ID< ACE_TCHAR > const& id () const; + ::XMLSchema::ID< ACE_TCHAR >& id (); + void id (::XMLSchema::ID< ACE_TCHAR > const& ); protected: - ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_; + ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_; public: DataType (::CIAO::Config_Handlers::TCKind const& kind__); @@ -280,7 +280,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // short - // + // public: typedef ::std::list< ::XMLSchema::short_ >::iterator short_iterator; typedef ::std::list< ::XMLSchema::short_ >::const_iterator short_const_iterator; @@ -292,10 +292,10 @@ namespace CIAO size_t count_short (void) const; protected: - ::std::list< ::XMLSchema::short_ > short_; + ::std::list< ::XMLSchema::short_ > short__; // long - // + // public: typedef ::std::list< ::XMLSchema::int_ >::iterator long_iterator; typedef ::std::list< ::XMLSchema::int_ >::const_iterator long_const_iterator; @@ -307,10 +307,10 @@ namespace CIAO size_t count_long (void) const; protected: - ::std::list< ::XMLSchema::int_ > long_; + ::std::list< ::XMLSchema::int_ > long__; // ushort - // + // public: typedef ::std::list< ::XMLSchema::unsignedShort >::iterator ushort_iterator; typedef ::std::list< ::XMLSchema::unsignedShort >::const_iterator ushort_const_iterator; @@ -325,7 +325,7 @@ namespace CIAO ::std::list< ::XMLSchema::unsignedShort > ushort_; // ulong - // + // public: typedef ::std::list< ::XMLSchema::unsignedInt >::iterator ulong_iterator; typedef ::std::list< ::XMLSchema::unsignedInt >::const_iterator ulong_const_iterator; @@ -340,7 +340,7 @@ namespace CIAO ::std::list< ::XMLSchema::unsignedInt > ulong_; // float - // + // public: typedef ::std::list< ::XMLSchema::float_ >::iterator float_iterator; typedef ::std::list< ::XMLSchema::float_ >::const_iterator float_const_iterator; @@ -352,10 +352,10 @@ namespace CIAO size_t count_float (void) const; protected: - ::std::list< ::XMLSchema::float_ > float_; + ::std::list< ::XMLSchema::float_ > float__; // double - // + // public: typedef ::std::list< ::XMLSchema::double_ >::iterator double_iterator; typedef ::std::list< ::XMLSchema::double_ >::const_iterator double_const_iterator; @@ -367,10 +367,10 @@ namespace CIAO size_t count_double (void) const; protected: - ::std::list< ::XMLSchema::double_ > double_; + ::std::list< ::XMLSchema::double_ > double__; // boolean - // + // public: typedef ::std::list< ::XMLSchema::boolean >::iterator boolean_iterator; typedef ::std::list< ::XMLSchema::boolean >::const_iterator boolean_const_iterator; @@ -385,7 +385,7 @@ namespace CIAO ::std::list< ::XMLSchema::boolean > boolean_; // octet - // + // public: typedef ::std::list< ::XMLSchema::unsignedByte >::iterator octet_iterator; typedef ::std::list< ::XMLSchema::unsignedByte >::const_iterator octet_const_iterator; @@ -400,7 +400,7 @@ namespace CIAO ::std::list< ::XMLSchema::unsignedByte > octet_; // enum - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator enum_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator enum_const_iterator; @@ -412,10 +412,10 @@ namespace CIAO size_t count_enum (void) const; protected: - ::std::list< ::XMLSchema::string< ACE_TCHAR > > enum_; + ::std::list< ::XMLSchema::string< ACE_TCHAR > > enum__; // string - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator string_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator string_const_iterator; @@ -430,7 +430,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > string_; // longlong - // + // public: typedef ::std::list< ::XMLSchema::long_ >::iterator longlong_iterator; typedef ::std::list< ::XMLSchema::long_ >::const_iterator longlong_const_iterator; @@ -445,7 +445,7 @@ namespace CIAO ::std::list< ::XMLSchema::long_ > longlong_; // ulonglong - // + // public: typedef ::std::list< ::XMLSchema::unsignedLong >::iterator ulonglong_iterator; typedef ::std::list< ::XMLSchema::unsignedLong >::const_iterator ulonglong_const_iterator; @@ -460,7 +460,7 @@ namespace CIAO ::std::list< ::XMLSchema::unsignedLong > ulonglong_; // longdouble - // + // public: typedef ::std::list< ::XMLSchema::double_ >::iterator longdouble_iterator; typedef ::std::list< ::XMLSchema::double_ >::const_iterator longdouble_const_iterator; @@ -475,7 +475,7 @@ namespace CIAO ::std::list< ::XMLSchema::double_ > longdouble_; // element - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::DataValue >::iterator element_iterator; typedef ::std::list< ::CIAO::Config_Handlers::DataValue >::const_iterator element_const_iterator; @@ -490,7 +490,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::DataValue > element_; // member - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::NamedValue >::iterator member_iterator; typedef ::std::list< ::CIAO::Config_Handlers::NamedValue >::const_iterator member_const_iterator; @@ -523,7 +523,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -532,7 +532,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // typeId - // + // public: ::XMLSchema::string< ACE_TCHAR > const& typeId () const; void typeId (::XMLSchema::string< ACE_TCHAR > const& ); @@ -541,7 +541,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_; // elementType - // + // public: ::CIAO::Config_Handlers::DataType const& elementType () const; void elementType (::CIAO::Config_Handlers::DataType const& ); @@ -570,7 +570,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -579,7 +579,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // typeId - // + // public: ::XMLSchema::string< ACE_TCHAR > const& typeId () const; void typeId (::XMLSchema::string< ACE_TCHAR > const& ); @@ -588,7 +588,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_; // member - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator member_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator member_const_iterator; @@ -604,7 +604,8 @@ namespace CIAO public: EnumType (::XMLSchema::string< ACE_TCHAR > const& name__, - ::XMLSchema::string< ACE_TCHAR > const& typeId__); + ::XMLSchema::string< ACE_TCHAR > const& typeId__, + ::std::list< ::XMLSchema::string< ACE_TCHAR > > const& member__); EnumType (::XSCRT::XML::Element< ACE_TCHAR > const&); EnumType (EnumType const& s); @@ -622,7 +623,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -631,7 +632,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // typeId - // + // public: ::XMLSchema::string< ACE_TCHAR > const& typeId () const; void typeId (::XMLSchema::string< ACE_TCHAR > const& ); @@ -640,7 +641,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_; // member - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::StructMemberType >::iterator member_iterator; typedef ::std::list< ::CIAO::Config_Handlers::StructMemberType >::const_iterator member_const_iterator; @@ -674,7 +675,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -683,7 +684,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // type - // + // public: ::CIAO::Config_Handlers::DataType const& type () const; void type (::CIAO::Config_Handlers::DataType const& ); @@ -711,7 +712,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -720,7 +721,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // typeId - // + // public: ::XMLSchema::string< ACE_TCHAR > const& typeId () const; void typeId (::XMLSchema::string< ACE_TCHAR > const& ); @@ -729,7 +730,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > typeId_; // modifier - // + // public: ::XMLSchema::string< ACE_TCHAR > const& modifier () const; void modifier (::XMLSchema::string< ACE_TCHAR > const& ); @@ -738,7 +739,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > modifier_; // baseType - // + // public: ::CIAO::Config_Handlers::DataType const& baseType () const; void baseType (::CIAO::Config_Handlers::DataType const& ); @@ -747,7 +748,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > baseType_; // member - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ValueMemberType >::iterator member_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ValueMemberType >::const_iterator member_const_iterator; @@ -783,7 +784,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -792,7 +793,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // visibility - // + // public: ::XMLSchema::string< ACE_TCHAR > const& visibility () const; void visibility (::XMLSchema::string< ACE_TCHAR > const& ); @@ -801,7 +802,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > visibility_; // type - // + // public: ::CIAO::Config_Handlers::DataType const& type () const; void type (::CIAO::Config_Handlers::DataType const& ); @@ -830,7 +831,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -839,7 +840,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // value - // + // public: ::CIAO::Config_Handlers::DataValue const& value () const; void value (::CIAO::Config_Handlers::DataValue const& ); @@ -867,7 +868,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // bound - // + // public: bool bound_p () const; ::XMLSchema::unsignedInt const& bound () const; @@ -877,7 +878,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::unsignedInt > bound_; // elementType - // + // public: ::CIAO::Config_Handlers::DataType const& elementType () const; void elementType (::CIAO::Config_Handlers::DataType const& ); @@ -904,7 +905,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // type - // + // public: ::CIAO::Config_Handlers::DataType const& type () const; void type (::CIAO::Config_Handlers::DataType const& ); @@ -913,7 +914,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_; // value - // + // public: ::CIAO::Config_Handlers::DataValue const& value () const; void value (::CIAO::Config_Handlers::DataValue const& ); @@ -941,7 +942,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -950,7 +951,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // value - // + // public: ::CIAO::Config_Handlers::Any const& value () const; void value (::CIAO::Config_Handlers::Any const& ); @@ -995,10 +996,10 @@ namespace CIAO Value integral () const; - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b); - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b); private: @@ -1017,7 +1018,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1026,7 +1027,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // kind - // + // public: ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const; void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& ); @@ -1035,7 +1036,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_; // dynamic - // + // public: ::XMLSchema::boolean const& dynamic () const; void dynamic (::XMLSchema::boolean const& ); @@ -1044,7 +1045,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::boolean > dynamic_; // value - // + // public: ::CIAO::Config_Handlers::Any const& value () const; void value (::CIAO::Config_Handlers::Any const& ); @@ -1074,7 +1075,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1083,7 +1084,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // resourceType - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator; @@ -1098,7 +1099,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator; @@ -1113,7 +1114,8 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_; public: - Resource (::XMLSchema::string< ACE_TCHAR > const& name__); + Resource (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ::XMLSchema::string< ACE_TCHAR > > const& resourceType__); Resource (::XSCRT::XML::Element< ACE_TCHAR > const&); Resource (Resource const& s); @@ -1131,7 +1133,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // resourceType - // + // public: ::XMLSchema::string< ACE_TCHAR > const& resourceType () const; void resourceType (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1140,7 +1142,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1149,7 +1151,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator; @@ -1183,7 +1185,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // requirementName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& requirementName () const; void requirementName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1192,7 +1194,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_; // resourceName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& resourceName () const; void resourceName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1201,7 +1203,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator; @@ -1235,7 +1237,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1244,7 +1246,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // source - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator; @@ -1259,7 +1261,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_; // node - // + // public: ::XMLSchema::string< ACE_TCHAR > const& node () const; void node (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1268,7 +1270,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_; // location - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator location_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator location_const_iterator; @@ -1283,7 +1285,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > location_; // execParameter - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator; @@ -1298,7 +1300,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Property > execParameter_; // deployRequirement - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator; @@ -1313,7 +1315,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_; // deployedResource - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::iterator deployedResource_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription >::const_iterator deployedResource_const_iterator; @@ -1327,16 +1329,16 @@ namespace CIAO protected: ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_; - // xmi_id - // + // id + // public: - bool xmi_id_p () const; - ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const; - ::XMLSchema::ID< ACE_TCHAR >& xmi_id (); - void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& ); + bool id_p () const; + ::XMLSchema::ID< ACE_TCHAR > const& id () const; + ::XMLSchema::ID< ACE_TCHAR >& id (); + void id (::XMLSchema::ID< ACE_TCHAR > const& ); protected: - ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_; + ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_; public: ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__, @@ -1358,7 +1360,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1367,7 +1369,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // source - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator source_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator source_const_iterator; @@ -1382,7 +1384,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_; // artifact - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::IdRef >::iterator artifact_iterator; typedef ::std::list< ::CIAO::Config_Handlers::IdRef >::const_iterator artifact_const_iterator; @@ -1397,7 +1399,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::IdRef > artifact_; // execParameter - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator execParameter_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator execParameter_const_iterator; @@ -1412,7 +1414,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Property > execParameter_; // deployRequirement - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator; @@ -1426,16 +1428,16 @@ namespace CIAO protected: ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_; - // xmi_id - // + // id + // public: - bool xmi_id_p () const; - ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const; - ::XMLSchema::ID< ACE_TCHAR >& xmi_id (); - void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& ); + bool id_p () const; + ::XMLSchema::ID< ACE_TCHAR > const& id () const; + ::XMLSchema::ID< ACE_TCHAR >& id (); + void id (::XMLSchema::ID< ACE_TCHAR > const& ); protected: - ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_; + ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_; public: MonolithicDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__); @@ -1472,10 +1474,10 @@ namespace CIAO Value integral () const; - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator== (ResourceUsageKind const& a, ResourceUsageKind const& b); - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b); private: @@ -1494,7 +1496,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // resourceUsage - // + // public: ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const; void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& ); @@ -1503,7 +1505,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_; // requirementName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& requirementName () const; void requirementName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1512,7 +1514,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_; // resourceName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& resourceName () const; void resourceName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1521,7 +1523,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator; @@ -1556,7 +1558,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1565,7 +1567,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // node - // + // public: ::XMLSchema::string< ACE_TCHAR > const& node () const; void node (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1574,7 +1576,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_; // source - // + // public: ::XMLSchema::string< ACE_TCHAR > const& source () const; void source (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1583,7 +1585,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_; // implementation - // + // public: ::CIAO::Config_Handlers::IdRef const& implementation () const; void implementation (::CIAO::Config_Handlers::IdRef const& ); @@ -1592,7 +1594,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::IdRef > implementation_; // configProperty - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator configProperty_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator configProperty_const_iterator; @@ -1607,7 +1609,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Property > configProperty_; // deployedResource - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >::iterator deployedResource_iterator; typedef ::std::list< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription >::const_iterator deployedResource_const_iterator; @@ -1622,7 +1624,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_; // deployedSharedResource - // + // public: bool deployedSharedResource_p () const; ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const; @@ -1631,16 +1633,16 @@ namespace CIAO protected: ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_; - // xmi_id - // + // id + // public: - bool xmi_id_p () const; - ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const; - ::XMLSchema::ID< ACE_TCHAR >& xmi_id (); - void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& ); + bool id_p () const; + ::XMLSchema::ID< ACE_TCHAR > const& id () const; + ::XMLSchema::ID< ACE_TCHAR >& id (); + void id (::XMLSchema::ID< ACE_TCHAR > const& ); protected: - ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_; + ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_; public: InstanceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__, @@ -1681,10 +1683,10 @@ namespace CIAO Value integral () const; - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b); - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b); private: @@ -1703,7 +1705,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1712,7 +1714,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // specificType - // + // public: bool specificType_p () const; ::XMLSchema::string< ACE_TCHAR > const& specificType () const; @@ -1722,7 +1724,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_; // supportedType - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator; @@ -1737,7 +1739,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > supportedType_; // provider - // + // public: ::XMLSchema::boolean const& provider () const; void provider (::XMLSchema::boolean const& ); @@ -1746,7 +1748,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::boolean > provider_; // exclusiveProvider - // + // public: ::XMLSchema::boolean const& exclusiveProvider () const; void exclusiveProvider (::XMLSchema::boolean const& ); @@ -1755,7 +1757,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::boolean > exclusiveProvider_; // exclusiveUser - // + // public: ::XMLSchema::boolean const& exclusiveUser () const; void exclusiveUser (::XMLSchema::boolean const& ); @@ -1764,7 +1766,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::boolean > exclusiveUser_; // optional - // + // public: ::XMLSchema::boolean const& optional () const; void optional (::XMLSchema::boolean const& ); @@ -1773,7 +1775,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::boolean > optional_; // kind - // + // public: ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const; void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& ); @@ -1805,7 +1807,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1814,7 +1816,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // type - // + // public: ::CIAO::Config_Handlers::DataType const& type () const; void type (::CIAO::Config_Handlers::DataType const& ); @@ -1842,7 +1844,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // portName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& portName () const; void portName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1869,7 +1871,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // portName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& portName () const; void portName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1878,7 +1880,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_; // provider - // + // public: bool provider_p () const; ::XMLSchema::string< ACE_TCHAR > const& provider () const; @@ -1888,7 +1890,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_; // kind - // + // public: ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const; void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& ); @@ -1897,7 +1899,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_; // instance - // + // public: ::CIAO::Config_Handlers::IdRef const& instance () const; void instance (::CIAO::Config_Handlers::IdRef const& ); @@ -1926,7 +1928,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // location - // + // public: ::XMLSchema::string< ACE_TCHAR > const& location () const; void location (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1935,7 +1937,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > location_; // provider - // + // public: ::XMLSchema::boolean const& provider () const; void provider (::XMLSchema::boolean const& ); @@ -1944,7 +1946,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::boolean > provider_; // portName - // + // public: bool portName_p () const; ::XMLSchema::string< ACE_TCHAR > const& portName () const; @@ -1954,7 +1956,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_; // supportedType - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator supportedType_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator supportedType_const_iterator; @@ -1988,7 +1990,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // targetName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& targetName () const; void targetName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -1997,7 +1999,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_; // requirementName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& requirementName () const; void requirementName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2006,7 +2008,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_; // resourceName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& resourceName () const; void resourceName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2015,7 +2017,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator; @@ -2050,7 +2052,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2059,7 +2061,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // source - // + // public: bool source_p () const; ::XMLSchema::string< ACE_TCHAR > const& source () const; @@ -2069,7 +2071,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_; // deployRequirement - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator; @@ -2084,7 +2086,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_; // externalEndpoint - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator; @@ -2099,7 +2101,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_; // internalEndpoint - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::iterator internalEndpoint_iterator; typedef ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator; @@ -2114,7 +2116,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint > internalEndpoint_; // externalReference - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator; @@ -2129,7 +2131,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint > externalReference_; // deployedResource - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::iterator deployedResource_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription >::const_iterator deployedResource_const_iterator; @@ -2162,7 +2164,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // requiredType - // + // public: ::XMLSchema::string< ACE_TCHAR > const& requiredType () const; void requiredType (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2189,7 +2191,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2198,7 +2200,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // resourceType - // + // public: typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator resourceType_iterator; typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator resourceType_const_iterator; @@ -2213,7 +2215,7 @@ namespace CIAO ::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::SatisfierProperty >::const_iterator property_const_iterator; @@ -2246,7 +2248,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // resourceUsage - // + // public: bool resourceUsage_p () const; ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const; @@ -2256,7 +2258,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_; // resourcePort - // + // public: bool resourcePort_p () const; ::XMLSchema::string< ACE_TCHAR > const& resourcePort () const; @@ -2266,7 +2268,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourcePort_; // componentPort - // + // public: bool componentPort_p () const; ::XMLSchema::string< ACE_TCHAR > const& componentPort () const; @@ -2276,7 +2278,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > componentPort_; // resourceType - // + // public: ::XMLSchema::string< ACE_TCHAR > const& resourceType () const; void resourceType (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2285,7 +2287,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2294,7 +2296,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // property - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator property_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator property_const_iterator; @@ -2328,7 +2330,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // portName - // + // public: ::XMLSchema::string< ACE_TCHAR > const& portName () const; void portName (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2337,7 +2339,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_; // instance - // + // public: ::CIAO::Config_Handlers::IdRef const& instance () const; void instance (::CIAO::Config_Handlers::IdRef const& ); @@ -2365,7 +2367,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // name - // + // public: ::XMLSchema::string< ACE_TCHAR > const& name () const; void name (::XMLSchema::string< ACE_TCHAR > const& ); @@ -2374,7 +2376,7 @@ namespace CIAO ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_; // deployRequirement - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::iterator deployRequirement_iterator; typedef ::std::list< ::CIAO::Config_Handlers::Requirement >::const_iterator deployRequirement_const_iterator; @@ -2389,7 +2391,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_; // internalEndpoint - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::iterator internalEndpoint_iterator; typedef ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint >::const_iterator internalEndpoint_const_iterator; @@ -2404,7 +2406,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::SubcomponentPortEndpoint > internalEndpoint_; // externalEndpoint - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::iterator externalEndpoint_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint >::const_iterator externalEndpoint_const_iterator; @@ -2419,7 +2421,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::ComponentExternalPortEndpoint > externalEndpoint_; // externalReference - // + // public: typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::iterator externalReference_iterator; typedef ::std::list< ::CIAO::Config_Handlers::ExternalReferenceEndpoint >::const_iterator externalReference_const_iterator; @@ -2466,10 +2468,10 @@ namespace CIAO Value integral () const; - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator== (PlanLocalityKind const& a, PlanLocalityKind const& b); - friend bool XSC_XML_Handlers_Export + friend bool XSC_XML_Handlers_Export operator!= (PlanLocalityKind const& a, PlanLocalityKind const& b); private: @@ -2488,7 +2490,7 @@ namespace CIAO typedef ::XSCRT::Type Base; // constraint - // + // public: ::CIAO::Config_Handlers::PlanLocalityKind const& constraint () const; void constraint (::CIAO::Config_Handlers::PlanLocalityKind const& ); @@ -2497,7 +2499,7 @@ namespace CIAO ::std::auto_ptr< ::CIAO::Config_Handlers::PlanLocalityKind > constraint_; // constrainedInstance - // + // public: ::CIAO::Config_Handlers::IdRef const& constrainedInstance () const; void constrainedInstance (::CIAO::Config_Handlers::IdRef const& ); @@ -2666,16 +2668,16 @@ namespace CIAO alias_none (Type const&); virtual void - xmi_id (Type&); + id (Type&); virtual void - xmi_id (Type const&); + id (Type const&); virtual void - xmi_id_none (Type&); + id_none (Type&); virtual void - xmi_id_none (Type const&); + id_none (Type const&); virtual void post (Type&); @@ -3900,6 +3902,12 @@ namespace CIAO source_post (Type const&); virtual void + source_none (Type&); + + virtual void + source_none (Type const&); + + virtual void node (Type&); virtual void @@ -3930,6 +3938,12 @@ namespace CIAO location_post (Type const&); virtual void + location_none (Type&); + + virtual void + location_none (Type const&); + + virtual void execParameter (Type&); virtual void @@ -4020,16 +4034,16 @@ namespace CIAO deployedResource_none (Type const&); virtual void - xmi_id (Type&); + id (Type&); virtual void - xmi_id (Type const&); + id (Type const&); virtual void - xmi_id_none (Type&); + id_none (Type&); virtual void - xmi_id_none (Type const&); + id_none (Type const&); virtual void post (Type&); @@ -4083,6 +4097,12 @@ namespace CIAO source_post (Type const&); virtual void + source_none (Type&); + + virtual void + source_none (Type const&); + + virtual void artifact (Type&); virtual void @@ -4107,6 +4127,12 @@ namespace CIAO artifact_post (Type const&); virtual void + artifact_none (Type&); + + virtual void + artifact_none (Type const&); + + virtual void execParameter (Type&); virtual void @@ -4167,16 +4193,16 @@ namespace CIAO deployRequirement_none (Type const&); virtual void - xmi_id (Type&); + id (Type&); virtual void - xmi_id (Type const&); + id (Type const&); virtual void - xmi_id_none (Type&); + id_none (Type&); virtual void - xmi_id_none (Type const&); + id_none (Type const&); virtual void post (Type&); @@ -4369,16 +4395,16 @@ namespace CIAO deployedSharedResource_none (Type const&); virtual void - xmi_id (Type&); + id (Type&); virtual void - xmi_id (Type const&); + id (Type const&); virtual void - xmi_id_none (Type&); + id_none (Type&); virtual void - xmi_id_none (Type const&); + id_none (Type const&); virtual void post (Type&); @@ -4664,6 +4690,12 @@ namespace CIAO supportedType_post (Type const&); virtual void + supportedType_none (Type&); + + virtual void + supportedType_none (Type const&); + + virtual void post (Type&); virtual void @@ -5000,6 +5032,12 @@ namespace CIAO resourceType_post (Type const&); virtual void + resourceType_none (Type&); + + virtual void + resourceType_none (Type const&); + + virtual void property (Type&); virtual void @@ -5363,42 +5401,36 @@ namespace CIAO { namespace Writer { - struct IdRef : Traversal::IdRef, + struct IdRef : Traversal::IdRef, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::IdRef Type; IdRef (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void href (Type &o) { - this->href (const_cast <Type const &> (o)); } - virtual void href (Type const&); - virtual void + virtual void idref (Type &o) { - this->idref (const_cast <Type const &> (o)); } - virtual void idref (Type const&); @@ -5406,12 +5438,12 @@ namespace CIAO IdRef (); }; - struct TCKind : Traversal::TCKind, + struct TCKind : Traversal::TCKind, virtual ::XSCRT::Writer< ACE_TCHAR > { TCKind (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { this->traverse (const_cast <Type const &> (o)); @@ -5424,613 +5456,505 @@ namespace CIAO TCKind (); }; - struct DataType : Traversal::DataType, + struct DataType : Traversal::DataType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::DataType Type; DataType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void kind (Type &o) { - this->kind (const_cast <Type const &> (o)); } - virtual void kind (Type const&); - virtual void + virtual void enum_ (Type &o) { - this->enum_ (const_cast <Type const &> (o)); } - virtual void enum_ (Type const&); - virtual void + virtual void struct_ (Type &o) { - this->struct_ (const_cast <Type const &> (o)); } - virtual void struct_ (Type const&); - virtual void + virtual void value (Type &o) { - this->value (const_cast <Type const &> (o)); } - virtual void value (Type const&); - virtual void + virtual void sequence (Type &o) { - this->sequence (const_cast <Type const &> (o)); } - virtual void sequence (Type const&); - virtual void + virtual void alias (Type &o) { - this->alias (const_cast <Type const &> (o)); } - virtual void alias (Type const&); - virtual void - xmi_id (Type &o) + virtual void + id (Type &o) { - - this->xmi_id (const_cast <Type const &> (o)); + this->id (const_cast <Type const &> (o)); } - virtual void - xmi_id (Type const&); + id (Type const&); protected: DataType (); }; - struct DataValue : Traversal::DataValue, + struct DataValue : Traversal::DataValue, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::DataValue Type; DataValue (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void short_pre (Type &o) { - this->short_pre (const_cast <Type const &> (o)); } - virtual void short_pre (Type const&); - virtual void + virtual void short_next (Type &o) { - this->short_next (const_cast <Type const &> (o)); } - virtual void short_next (Type const&); - virtual void + virtual void short_post (Type &o) { - this->short_post (const_cast <Type const &> (o)); } - virtual void short_post (Type const&); - virtual void + virtual void long_pre (Type &o) { - this->long_pre (const_cast <Type const &> (o)); } - virtual void long_pre (Type const&); - virtual void + virtual void long_next (Type &o) { - this->long_next (const_cast <Type const &> (o)); } - virtual void long_next (Type const&); - virtual void + virtual void long_post (Type &o) { - this->long_post (const_cast <Type const &> (o)); } - virtual void long_post (Type const&); - virtual void + virtual void ushort_pre (Type &o) { - this->ushort_pre (const_cast <Type const &> (o)); } - virtual void ushort_pre (Type const&); - virtual void + virtual void ushort_next (Type &o) { - this->ushort_next (const_cast <Type const &> (o)); } - virtual void ushort_next (Type const&); - virtual void + virtual void ushort_post (Type &o) { - this->ushort_post (const_cast <Type const &> (o)); } - virtual void ushort_post (Type const&); - virtual void + virtual void ulong_pre (Type &o) { - this->ulong_pre (const_cast <Type const &> (o)); } - virtual void ulong_pre (Type const&); - virtual void + virtual void ulong_next (Type &o) { - this->ulong_next (const_cast <Type const &> (o)); } - virtual void ulong_next (Type const&); - virtual void + virtual void ulong_post (Type &o) { - this->ulong_post (const_cast <Type const &> (o)); } - virtual void ulong_post (Type const&); - virtual void + virtual void float_pre (Type &o) { - this->float_pre (const_cast <Type const &> (o)); } - virtual void float_pre (Type const&); - virtual void + virtual void float_next (Type &o) { - this->float_next (const_cast <Type const &> (o)); } - virtual void float_next (Type const&); - virtual void + virtual void float_post (Type &o) { - this->float_post (const_cast <Type const &> (o)); } - virtual void float_post (Type const&); - virtual void + virtual void double_pre (Type &o) { - this->double_pre (const_cast <Type const &> (o)); } - virtual void double_pre (Type const&); - virtual void + virtual void double_next (Type &o) { - this->double_next (const_cast <Type const &> (o)); } - virtual void double_next (Type const&); - virtual void + virtual void double_post (Type &o) { - this->double_post (const_cast <Type const &> (o)); } - virtual void double_post (Type const&); - virtual void + virtual void boolean_pre (Type &o) { - this->boolean_pre (const_cast <Type const &> (o)); } - virtual void boolean_pre (Type const&); - virtual void + virtual void boolean_next (Type &o) { - this->boolean_next (const_cast <Type const &> (o)); } - virtual void boolean_next (Type const&); - virtual void + virtual void boolean_post (Type &o) { - this->boolean_post (const_cast <Type const &> (o)); } - virtual void boolean_post (Type const&); - virtual void + virtual void octet_pre (Type &o) { - this->octet_pre (const_cast <Type const &> (o)); } - virtual void octet_pre (Type const&); - virtual void + virtual void octet_next (Type &o) { - this->octet_next (const_cast <Type const &> (o)); } - virtual void octet_next (Type const&); - virtual void + virtual void octet_post (Type &o) { - this->octet_post (const_cast <Type const &> (o)); } - virtual void octet_post (Type const&); - virtual void + virtual void enum_pre (Type &o) { - this->enum_pre (const_cast <Type const &> (o)); } - virtual void enum_pre (Type const&); - virtual void + virtual void enum_next (Type &o) { - this->enum_next (const_cast <Type const &> (o)); } - virtual void enum_next (Type const&); - virtual void + virtual void enum_post (Type &o) { - this->enum_post (const_cast <Type const &> (o)); } - virtual void enum_post (Type const&); - virtual void + virtual void string_pre (Type &o) { - this->string_pre (const_cast <Type const &> (o)); } - virtual void string_pre (Type const&); - virtual void + virtual void string_next (Type &o) { - this->string_next (const_cast <Type const &> (o)); } - virtual void string_next (Type const&); - virtual void + virtual void string_post (Type &o) { - this->string_post (const_cast <Type const &> (o)); } - virtual void string_post (Type const&); - virtual void + virtual void longlong_pre (Type &o) { - this->longlong_pre (const_cast <Type const &> (o)); } - virtual void longlong_pre (Type const&); - virtual void + virtual void longlong_next (Type &o) { - this->longlong_next (const_cast <Type const &> (o)); } - virtual void longlong_next (Type const&); - virtual void + virtual void longlong_post (Type &o) { - this->longlong_post (const_cast <Type const &> (o)); } - virtual void longlong_post (Type const&); - virtual void + virtual void ulonglong_pre (Type &o) { - this->ulonglong_pre (const_cast <Type const &> (o)); } - virtual void ulonglong_pre (Type const&); - virtual void + virtual void ulonglong_next (Type &o) { - this->ulonglong_next (const_cast <Type const &> (o)); } - virtual void ulonglong_next (Type const&); - virtual void + virtual void ulonglong_post (Type &o) { - this->ulonglong_post (const_cast <Type const &> (o)); } - virtual void ulonglong_post (Type const&); - virtual void + virtual void longdouble_pre (Type &o) { - this->longdouble_pre (const_cast <Type const &> (o)); } - virtual void longdouble_pre (Type const&); - virtual void + virtual void longdouble_next (Type &o) { - this->longdouble_next (const_cast <Type const &> (o)); } - virtual void longdouble_next (Type const&); - virtual void + virtual void longdouble_post (Type &o) { - this->longdouble_post (const_cast <Type const &> (o)); } - virtual void longdouble_post (Type const&); - virtual void + virtual void element_pre (Type &o) { - this->element_pre (const_cast <Type const &> (o)); } - virtual void element_pre (Type const&); - virtual void + virtual void element_next (Type &o) { - this->element_next (const_cast <Type const &> (o)); } - virtual void element_next (Type const&); - virtual void + virtual void element_post (Type &o) { - this->element_post (const_cast <Type const &> (o)); } - virtual void element_post (Type const&); - virtual void + virtual void member_pre (Type &o) { - this->member_pre (const_cast <Type const &> (o)); } - virtual void member_pre (Type const&); - virtual void + virtual void member_next (Type &o) { - this->member_next (const_cast <Type const &> (o)); } - virtual void member_next (Type const&); - virtual void + virtual void member_post (Type &o) { - this->member_post (const_cast <Type const &> (o)); } - virtual void member_post (Type const&); @@ -6038,53 +5962,45 @@ namespace CIAO DataValue (); }; - struct AliasType : Traversal::AliasType, + struct AliasType : Traversal::AliasType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::AliasType Type; AliasType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void typeId (Type &o) { - this->typeId (const_cast <Type const &> (o)); } - virtual void typeId (Type const&); - virtual void + virtual void elementType (Type &o) { - this->elementType (const_cast <Type const &> (o)); } - virtual void elementType (Type const&); @@ -6092,75 +6008,63 @@ namespace CIAO AliasType (); }; - struct EnumType : Traversal::EnumType, + struct EnumType : Traversal::EnumType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::EnumType Type; EnumType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void typeId (Type &o) { - this->typeId (const_cast <Type const &> (o)); } - virtual void typeId (Type const&); - virtual void + virtual void member_pre (Type &o) { - this->member_pre (const_cast <Type const &> (o)); } - virtual void member_pre (Type const&); - virtual void + virtual void member_next (Type &o) { - this->member_next (const_cast <Type const &> (o)); } - virtual void member_next (Type const&); - virtual void + virtual void member_post (Type &o) { - this->member_post (const_cast <Type const &> (o)); } - virtual void member_post (Type const&); @@ -6168,75 +6072,63 @@ namespace CIAO EnumType (); }; - struct StructType : Traversal::StructType, + struct StructType : Traversal::StructType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::StructType Type; StructType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void typeId (Type &o) { - this->typeId (const_cast <Type const &> (o)); } - virtual void typeId (Type const&); - virtual void + virtual void member_pre (Type &o) { - this->member_pre (const_cast <Type const &> (o)); } - virtual void member_pre (Type const&); - virtual void + virtual void member_next (Type &o) { - this->member_next (const_cast <Type const &> (o)); } - virtual void member_next (Type const&); - virtual void + virtual void member_post (Type &o) { - this->member_post (const_cast <Type const &> (o)); } - virtual void member_post (Type const&); @@ -6244,42 +6136,36 @@ namespace CIAO StructType (); }; - struct StructMemberType : Traversal::StructMemberType, + struct StructMemberType : Traversal::StructMemberType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::StructMemberType Type; StructMemberType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void type (Type &o) { - this->type (const_cast <Type const &> (o)); } - virtual void type (Type const&); @@ -6287,97 +6173,81 @@ namespace CIAO StructMemberType (); }; - struct ValueType : Traversal::ValueType, + struct ValueType : Traversal::ValueType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ValueType Type; ValueType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void typeId (Type &o) { - this->typeId (const_cast <Type const &> (o)); } - virtual void typeId (Type const&); - virtual void + virtual void modifier (Type &o) { - this->modifier (const_cast <Type const &> (o)); } - virtual void modifier (Type const&); - virtual void + virtual void baseType (Type &o) { - this->baseType (const_cast <Type const &> (o)); } - virtual void baseType (Type const&); - virtual void + virtual void member_pre (Type &o) { - this->member_pre (const_cast <Type const &> (o)); } - virtual void member_pre (Type const&); - virtual void + virtual void member_next (Type &o) { - this->member_next (const_cast <Type const &> (o)); } - virtual void member_next (Type const&); - virtual void + virtual void member_post (Type &o) { - this->member_post (const_cast <Type const &> (o)); } - virtual void member_post (Type const&); @@ -6385,53 +6255,45 @@ namespace CIAO ValueType (); }; - struct ValueMemberType : Traversal::ValueMemberType, + struct ValueMemberType : Traversal::ValueMemberType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ValueMemberType Type; ValueMemberType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void visibility (Type &o) { - this->visibility (const_cast <Type const &> (o)); } - virtual void visibility (Type const&); - virtual void + virtual void type (Type &o) { - this->type (const_cast <Type const &> (o)); } - virtual void type (Type const&); @@ -6439,42 +6301,36 @@ namespace CIAO ValueMemberType (); }; - struct NamedValue : Traversal::NamedValue, + struct NamedValue : Traversal::NamedValue, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::NamedValue Type; NamedValue (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void value (Type &o) { - this->value (const_cast <Type const &> (o)); } - virtual void value (Type const&); @@ -6482,42 +6338,36 @@ namespace CIAO NamedValue (); }; - struct SequenceType : Traversal::SequenceType, + struct SequenceType : Traversal::SequenceType, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::SequenceType Type; SequenceType (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void bound (Type &o) { - this->bound (const_cast <Type const &> (o)); } - virtual void bound (Type const&); - virtual void + virtual void elementType (Type &o) { - this->elementType (const_cast <Type const &> (o)); } - virtual void elementType (Type const&); @@ -6525,42 +6375,36 @@ namespace CIAO SequenceType (); }; - struct Any : Traversal::Any, + struct Any : Traversal::Any, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::Any Type; Any (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void type (Type &o) { - this->type (const_cast <Type const &> (o)); } - virtual void type (Type const&); - virtual void + virtual void value (Type &o) { - this->value (const_cast <Type const &> (o)); } - virtual void value (Type const&); @@ -6568,42 +6412,36 @@ namespace CIAO Any (); }; - struct Property : Traversal::Property, + struct Property : Traversal::Property, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::Property Type; Property (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void value (Type &o) { - this->value (const_cast <Type const &> (o)); } - virtual void value (Type const&); @@ -6611,12 +6449,12 @@ namespace CIAO Property (); }; - struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind, + struct SatisfierPropertyKind : Traversal::SatisfierPropertyKind, virtual ::XSCRT::Writer< ACE_TCHAR > { SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { this->traverse (const_cast <Type const &> (o)); @@ -6629,64 +6467,54 @@ namespace CIAO SatisfierPropertyKind (); }; - struct SatisfierProperty : Traversal::SatisfierProperty, + struct SatisfierProperty : Traversal::SatisfierProperty, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::SatisfierProperty Type; SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void kind (Type &o) { - this->kind (const_cast <Type const &> (o)); } - virtual void kind (Type const&); - virtual void + virtual void dynamic (Type &o) { - this->dynamic (const_cast <Type const &> (o)); } - virtual void dynamic (Type const&); - virtual void + virtual void value (Type &o) { - this->value (const_cast <Type const &> (o)); } - virtual void value (Type const&); @@ -6694,97 +6522,81 @@ namespace CIAO SatisfierProperty (); }; - struct Resource : Traversal::Resource, + struct Resource : Traversal::Resource, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::Resource Type; Resource (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void resourceType_pre (Type &o) { - this->resourceType_pre (const_cast <Type const &> (o)); } - virtual void resourceType_pre (Type const&); - virtual void + virtual void resourceType_next (Type &o) { - this->resourceType_next (const_cast <Type const &> (o)); } - virtual void resourceType_next (Type const&); - virtual void + virtual void resourceType_post (Type &o) { - this->resourceType_post (const_cast <Type const &> (o)); } - virtual void resourceType_post (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -6792,75 +6604,63 @@ namespace CIAO Resource (); }; - struct Requirement : Traversal::Requirement, + struct Requirement : Traversal::Requirement, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::Requirement Type; Requirement (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void resourceType (Type &o) { - this->resourceType (const_cast <Type const &> (o)); } - virtual void resourceType (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -6868,75 +6668,63 @@ namespace CIAO Requirement (); }; - struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, + struct ResourceDeploymentDescription : Traversal::ResourceDeploymentDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type; ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void requirementName (Type &o) { - this->requirementName (const_cast <Type const &> (o)); } - virtual void requirementName (Type const&); - virtual void + virtual void resourceName (Type &o) { - this->resourceName (const_cast <Type const &> (o)); } - virtual void resourceName (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -6944,406 +6732,338 @@ namespace CIAO ResourceDeploymentDescription (); }; - struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, + struct ArtifactDeploymentDescription : Traversal::ArtifactDeploymentDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type; ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void source_pre (Type &o) { - this->source_pre (const_cast <Type const &> (o)); } - virtual void source_pre (Type const&); - virtual void + virtual void source_next (Type &o) { - this->source_next (const_cast <Type const &> (o)); } - virtual void source_next (Type const&); - virtual void + virtual void source_post (Type &o) { - this->source_post (const_cast <Type const &> (o)); } - virtual void source_post (Type const&); - virtual void + virtual void node (Type &o) { - this->node (const_cast <Type const &> (o)); } - virtual void node (Type const&); - virtual void + virtual void location_pre (Type &o) { - this->location_pre (const_cast <Type const &> (o)); } - virtual void location_pre (Type const&); - virtual void + virtual void location_next (Type &o) { - this->location_next (const_cast <Type const &> (o)); } - virtual void location_next (Type const&); - virtual void + virtual void location_post (Type &o) { - this->location_post (const_cast <Type const &> (o)); } - virtual void location_post (Type const&); - virtual void + virtual void execParameter_pre (Type &o) { - this->execParameter_pre (const_cast <Type const &> (o)); } - virtual void execParameter_pre (Type const&); - virtual void + virtual void execParameter_next (Type &o) { - this->execParameter_next (const_cast <Type const &> (o)); } - virtual void execParameter_next (Type const&); - virtual void + virtual void execParameter_post (Type &o) { - this->execParameter_post (const_cast <Type const &> (o)); } - virtual void execParameter_post (Type const&); - virtual void + virtual void deployRequirement_pre (Type &o) { - this->deployRequirement_pre (const_cast <Type const &> (o)); } - virtual void deployRequirement_pre (Type const&); - virtual void + virtual void deployRequirement_next (Type &o) { - this->deployRequirement_next (const_cast <Type const &> (o)); } - virtual void deployRequirement_next (Type const&); - virtual void + virtual void deployRequirement_post (Type &o) { - this->deployRequirement_post (const_cast <Type const &> (o)); } - virtual void deployRequirement_post (Type const&); - virtual void + virtual void deployedResource_pre (Type &o) { - this->deployedResource_pre (const_cast <Type const &> (o)); } - virtual void deployedResource_pre (Type const&); - virtual void + virtual void deployedResource_next (Type &o) { - this->deployedResource_next (const_cast <Type const &> (o)); } - virtual void deployedResource_next (Type const&); - virtual void + virtual void deployedResource_post (Type &o) { - this->deployedResource_post (const_cast <Type const &> (o)); } - virtual void deployedResource_post (Type const&); - virtual void - xmi_id (Type &o) + virtual void + id (Type &o) { - - this->xmi_id (const_cast <Type const &> (o)); + this->id (const_cast <Type const &> (o)); } - virtual void - xmi_id (Type const&); + id (Type const&); protected: ArtifactDeploymentDescription (); }; - struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, + struct MonolithicDeploymentDescription : Traversal::MonolithicDeploymentDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type; MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void source_pre (Type &o) { - this->source_pre (const_cast <Type const &> (o)); } - virtual void source_pre (Type const&); - virtual void + virtual void source_next (Type &o) { - this->source_next (const_cast <Type const &> (o)); } - virtual void source_next (Type const&); - virtual void + virtual void source_post (Type &o) { - this->source_post (const_cast <Type const &> (o)); } - virtual void source_post (Type const&); - virtual void + virtual void artifact_pre (Type &o) { - this->artifact_pre (const_cast <Type const &> (o)); } - virtual void artifact_pre (Type const&); - virtual void + virtual void artifact_next (Type &o) { - this->artifact_next (const_cast <Type const &> (o)); } - virtual void artifact_next (Type const&); - virtual void + virtual void artifact_post (Type &o) { - this->artifact_post (const_cast <Type const &> (o)); } - virtual void artifact_post (Type const&); - virtual void + virtual void execParameter_pre (Type &o) { - this->execParameter_pre (const_cast <Type const &> (o)); } - virtual void execParameter_pre (Type const&); - virtual void + virtual void execParameter_next (Type &o) { - this->execParameter_next (const_cast <Type const &> (o)); } - virtual void execParameter_next (Type const&); - virtual void + virtual void execParameter_post (Type &o) { - this->execParameter_post (const_cast <Type const &> (o)); } - virtual void execParameter_post (Type const&); - virtual void + virtual void deployRequirement_pre (Type &o) { - this->deployRequirement_pre (const_cast <Type const &> (o)); } - virtual void deployRequirement_pre (Type const&); - virtual void + virtual void deployRequirement_next (Type &o) { - this->deployRequirement_next (const_cast <Type const &> (o)); } - virtual void deployRequirement_next (Type const&); - virtual void + virtual void deployRequirement_post (Type &o) { - this->deployRequirement_post (const_cast <Type const &> (o)); } - virtual void deployRequirement_post (Type const&); - virtual void - xmi_id (Type &o) + virtual void + id (Type &o) { - - this->xmi_id (const_cast <Type const &> (o)); + this->id (const_cast <Type const &> (o)); } - virtual void - xmi_id (Type const&); + id (Type const&); protected: MonolithicDeploymentDescription (); }; - struct ResourceUsageKind : Traversal::ResourceUsageKind, + struct ResourceUsageKind : Traversal::ResourceUsageKind, virtual ::XSCRT::Writer< ACE_TCHAR > { ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { this->traverse (const_cast <Type const &> (o)); @@ -7356,86 +7076,72 @@ namespace CIAO ResourceUsageKind (); }; - struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, + struct InstanceResourceDeploymentDescription : Traversal::InstanceResourceDeploymentDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type; InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void resourceUsage (Type &o) { - this->resourceUsage (const_cast <Type const &> (o)); } - virtual void resourceUsage (Type const&); - virtual void + virtual void requirementName (Type &o) { - this->requirementName (const_cast <Type const &> (o)); } - virtual void requirementName (Type const&); - virtual void + virtual void resourceName (Type &o) { - this->resourceName (const_cast <Type const &> (o)); } - virtual void resourceName (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -7443,165 +7149,139 @@ namespace CIAO InstanceResourceDeploymentDescription (); }; - struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, + struct InstanceDeploymentDescription : Traversal::InstanceDeploymentDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type; InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void node (Type &o) { - this->node (const_cast <Type const &> (o)); } - virtual void node (Type const&); - virtual void + virtual void source (Type &o) { - this->source (const_cast <Type const &> (o)); } - virtual void source (Type const&); - virtual void + virtual void implementation (Type &o) { - this->implementation (const_cast <Type const &> (o)); } - virtual void implementation (Type const&); - virtual void + virtual void configProperty_pre (Type &o) { - this->configProperty_pre (const_cast <Type const &> (o)); } - virtual void configProperty_pre (Type const&); - virtual void + virtual void configProperty_next (Type &o) { - this->configProperty_next (const_cast <Type const &> (o)); } - virtual void configProperty_next (Type const&); - virtual void + virtual void configProperty_post (Type &o) { - this->configProperty_post (const_cast <Type const &> (o)); } - virtual void configProperty_post (Type const&); - virtual void + virtual void deployedResource_pre (Type &o) { - this->deployedResource_pre (const_cast <Type const &> (o)); } - virtual void deployedResource_pre (Type const&); - virtual void + virtual void deployedResource_next (Type &o) { - this->deployedResource_next (const_cast <Type const &> (o)); } - virtual void deployedResource_next (Type const&); - virtual void + virtual void deployedResource_post (Type &o) { - this->deployedResource_post (const_cast <Type const &> (o)); } - virtual void deployedResource_post (Type const&); - virtual void + virtual void deployedSharedResource (Type &o) { - this->deployedSharedResource (const_cast <Type const &> (o)); } - virtual void deployedSharedResource (Type const&); - virtual void - xmi_id (Type &o) + virtual void + id (Type &o) { - - this->xmi_id (const_cast <Type const &> (o)); + this->id (const_cast <Type const &> (o)); } - virtual void - xmi_id (Type const&); + id (Type const&); protected: InstanceDeploymentDescription (); }; - struct CCMComponentPortKind : Traversal::CCMComponentPortKind, + struct CCMComponentPortKind : Traversal::CCMComponentPortKind, virtual ::XSCRT::Writer< ACE_TCHAR > { CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { this->traverse (const_cast <Type const &> (o)); @@ -7614,130 +7294,108 @@ namespace CIAO CCMComponentPortKind (); }; - struct ComponentPortDescription : Traversal::ComponentPortDescription, + struct ComponentPortDescription : Traversal::ComponentPortDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ComponentPortDescription Type; ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void specificType (Type &o) { - this->specificType (const_cast <Type const &> (o)); } - virtual void specificType (Type const&); - virtual void + virtual void supportedType_pre (Type &o) { - this->supportedType_pre (const_cast <Type const &> (o)); } - virtual void supportedType_pre (Type const&); - virtual void + virtual void supportedType_next (Type &o) { - this->supportedType_next (const_cast <Type const &> (o)); } - virtual void supportedType_next (Type const&); - virtual void + virtual void supportedType_post (Type &o) { - this->supportedType_post (const_cast <Type const &> (o)); } - virtual void supportedType_post (Type const&); - virtual void + virtual void provider (Type &o) { - this->provider (const_cast <Type const &> (o)); } - virtual void provider (Type const&); - virtual void + virtual void exclusiveProvider (Type &o) { - this->exclusiveProvider (const_cast <Type const &> (o)); } - virtual void exclusiveProvider (Type const&); - virtual void + virtual void exclusiveUser (Type &o) { - this->exclusiveUser (const_cast <Type const &> (o)); } - virtual void exclusiveUser (Type const&); - virtual void + virtual void optional (Type &o) { - this->optional (const_cast <Type const &> (o)); } - virtual void optional (Type const&); - virtual void + virtual void kind (Type &o) { - this->kind (const_cast <Type const &> (o)); } - virtual void kind (Type const&); @@ -7745,42 +7403,36 @@ namespace CIAO ComponentPortDescription (); }; - struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription, + struct ComponentPropertyDescription : Traversal::ComponentPropertyDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type; ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void type (Type &o) { - this->type (const_cast <Type const &> (o)); } - virtual void type (Type const&); @@ -7788,31 +7440,27 @@ namespace CIAO ComponentPropertyDescription (); }; - struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, + struct ComponentExternalPortEndpoint : Traversal::ComponentExternalPortEndpoint, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type; ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void portName (Type &o) { - this->portName (const_cast <Type const &> (o)); } - virtual void portName (Type const&); @@ -7820,64 +7468,54 @@ namespace CIAO ComponentExternalPortEndpoint (); }; - struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, + struct PlanSubcomponentPortEndpoint : Traversal::PlanSubcomponentPortEndpoint, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type; PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void portName (Type &o) { - this->portName (const_cast <Type const &> (o)); } - virtual void portName (Type const&); - virtual void + virtual void provider (Type &o) { - this->provider (const_cast <Type const &> (o)); } - virtual void provider (Type const&); - virtual void + virtual void kind (Type &o) { - this->kind (const_cast <Type const &> (o)); } - virtual void kind (Type const&); - virtual void + virtual void instance (Type &o) { - this->instance (const_cast <Type const &> (o)); } - virtual void instance (Type const&); @@ -7885,86 +7523,72 @@ namespace CIAO PlanSubcomponentPortEndpoint (); }; - struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, + struct ExternalReferenceEndpoint : Traversal::ExternalReferenceEndpoint, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type; ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void location (Type &o) { - this->location (const_cast <Type const &> (o)); } - virtual void location (Type const&); - virtual void + virtual void provider (Type &o) { - this->provider (const_cast <Type const &> (o)); } - virtual void provider (Type const&); - virtual void + virtual void portName (Type &o) { - this->portName (const_cast <Type const &> (o)); } - virtual void portName (Type const&); - virtual void + virtual void supportedType_pre (Type &o) { - this->supportedType_pre (const_cast <Type const &> (o)); } - virtual void supportedType_pre (Type const&); - virtual void + virtual void supportedType_next (Type &o) { - this->supportedType_next (const_cast <Type const &> (o)); } - virtual void supportedType_next (Type const&); - virtual void + virtual void supportedType_post (Type &o) { - this->supportedType_post (const_cast <Type const &> (o)); } - virtual void supportedType_post (Type const&); @@ -7972,86 +7596,72 @@ namespace CIAO ExternalReferenceEndpoint (); }; - struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, + struct ConnectionResourceDeploymentDescription : Traversal::ConnectionResourceDeploymentDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type; ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void targetName (Type &o) { - this->targetName (const_cast <Type const &> (o)); } - virtual void targetName (Type const&); - virtual void + virtual void requirementName (Type &o) { - this->requirementName (const_cast <Type const &> (o)); } - virtual void requirementName (Type const&); - virtual void + virtual void resourceName (Type &o) { - this->resourceName (const_cast <Type const &> (o)); } - virtual void resourceName (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -8059,207 +7669,171 @@ namespace CIAO ConnectionResourceDeploymentDescription (); }; - struct PlanConnectionDescription : Traversal::PlanConnectionDescription, + struct PlanConnectionDescription : Traversal::PlanConnectionDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type; PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void source (Type &o) { - this->source (const_cast <Type const &> (o)); } - virtual void source (Type const&); - virtual void + virtual void deployRequirement_pre (Type &o) { - this->deployRequirement_pre (const_cast <Type const &> (o)); } - virtual void deployRequirement_pre (Type const&); - virtual void + virtual void deployRequirement_next (Type &o) { - this->deployRequirement_next (const_cast <Type const &> (o)); } - virtual void deployRequirement_next (Type const&); - virtual void + virtual void deployRequirement_post (Type &o) { - this->deployRequirement_post (const_cast <Type const &> (o)); } - virtual void deployRequirement_post (Type const&); - virtual void + virtual void externalEndpoint_pre (Type &o) { - this->externalEndpoint_pre (const_cast <Type const &> (o)); } - virtual void externalEndpoint_pre (Type const&); - virtual void + virtual void externalEndpoint_next (Type &o) { - this->externalEndpoint_next (const_cast <Type const &> (o)); } - virtual void externalEndpoint_next (Type const&); - virtual void + virtual void externalEndpoint_post (Type &o) { - this->externalEndpoint_post (const_cast <Type const &> (o)); } - virtual void externalEndpoint_post (Type const&); - virtual void + virtual void internalEndpoint_pre (Type &o) { - this->internalEndpoint_pre (const_cast <Type const &> (o)); } - virtual void internalEndpoint_pre (Type const&); - virtual void + virtual void internalEndpoint_next (Type &o) { - this->internalEndpoint_next (const_cast <Type const &> (o)); } - virtual void internalEndpoint_next (Type const&); - virtual void + virtual void internalEndpoint_post (Type &o) { - this->internalEndpoint_post (const_cast <Type const &> (o)); } - virtual void internalEndpoint_post (Type const&); - virtual void + virtual void externalReference_pre (Type &o) { - this->externalReference_pre (const_cast <Type const &> (o)); } - virtual void externalReference_pre (Type const&); - virtual void + virtual void externalReference_next (Type &o) { - this->externalReference_next (const_cast <Type const &> (o)); } - virtual void externalReference_next (Type const&); - virtual void + virtual void externalReference_post (Type &o) { - this->externalReference_post (const_cast <Type const &> (o)); } - virtual void externalReference_post (Type const&); - virtual void + virtual void deployedResource_pre (Type &o) { - this->deployedResource_pre (const_cast <Type const &> (o)); } - virtual void deployedResource_pre (Type const&); - virtual void + virtual void deployedResource_next (Type &o) { - this->deployedResource_next (const_cast <Type const &> (o)); } - virtual void deployedResource_next (Type const&); - virtual void + virtual void deployedResource_post (Type &o) { - this->deployedResource_post (const_cast <Type const &> (o)); } - virtual void deployedResource_post (Type const&); @@ -8267,31 +7841,27 @@ namespace CIAO PlanConnectionDescription (); }; - struct ImplementationDependency : Traversal::ImplementationDependency, + struct ImplementationDependency : Traversal::ImplementationDependency, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ImplementationDependency Type; ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void requiredType (Type &o) { - this->requiredType (const_cast <Type const &> (o)); } - virtual void requiredType (Type const&); @@ -8299,97 +7869,81 @@ namespace CIAO ImplementationDependency (); }; - struct Capability : Traversal::Capability, + struct Capability : Traversal::Capability, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::Capability Type; Capability (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void resourceType_pre (Type &o) { - this->resourceType_pre (const_cast <Type const &> (o)); } - virtual void resourceType_pre (Type const&); - virtual void + virtual void resourceType_next (Type &o) { - this->resourceType_next (const_cast <Type const &> (o)); } - virtual void resourceType_next (Type const&); - virtual void + virtual void resourceType_post (Type &o) { - this->resourceType_post (const_cast <Type const &> (o)); } - virtual void resourceType_post (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -8397,108 +7951,90 @@ namespace CIAO Capability (); }; - struct ImplementationRequirement : Traversal::ImplementationRequirement, + struct ImplementationRequirement : Traversal::ImplementationRequirement, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::ImplementationRequirement Type; ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void resourceUsage (Type &o) { - this->resourceUsage (const_cast <Type const &> (o)); } - virtual void resourceUsage (Type const&); - virtual void + virtual void resourcePort (Type &o) { - this->resourcePort (const_cast <Type const &> (o)); } - virtual void resourcePort (Type const&); - virtual void + virtual void componentPort (Type &o) { - this->componentPort (const_cast <Type const &> (o)); } - virtual void componentPort (Type const&); - virtual void + virtual void resourceType (Type &o) { - this->resourceType (const_cast <Type const &> (o)); } - virtual void resourceType (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); - virtual void + virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); - virtual void + virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); @@ -8506,42 +8042,36 @@ namespace CIAO ImplementationRequirement (); }; - struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, + struct SubcomponentPortEndpoint : Traversal::SubcomponentPortEndpoint, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type; SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void portName (Type &o) { - this->portName (const_cast <Type const &> (o)); } - virtual void portName (Type const&); - virtual void + virtual void instance (Type &o) { - this->instance (const_cast <Type const &> (o)); } - virtual void instance (Type const&); @@ -8549,163 +8079,135 @@ namespace CIAO SubcomponentPortEndpoint (); }; - struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, + struct AssemblyConnectionDescription : Traversal::AssemblyConnectionDescription, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type; AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); - virtual void + virtual void deployRequirement_pre (Type &o) { - this->deployRequirement_pre (const_cast <Type const &> (o)); } - virtual void deployRequirement_pre (Type const&); - virtual void + virtual void deployRequirement_next (Type &o) { - this->deployRequirement_next (const_cast <Type const &> (o)); } - virtual void deployRequirement_next (Type const&); - virtual void + virtual void deployRequirement_post (Type &o) { - this->deployRequirement_post (const_cast <Type const &> (o)); } - virtual void deployRequirement_post (Type const&); - virtual void + virtual void internalEndpoint_pre (Type &o) { - this->internalEndpoint_pre (const_cast <Type const &> (o)); } - virtual void internalEndpoint_pre (Type const&); - virtual void + virtual void internalEndpoint_next (Type &o) { - this->internalEndpoint_next (const_cast <Type const &> (o)); } - virtual void internalEndpoint_next (Type const&); - virtual void + virtual void internalEndpoint_post (Type &o) { - this->internalEndpoint_post (const_cast <Type const &> (o)); } - virtual void internalEndpoint_post (Type const&); - virtual void + virtual void externalEndpoint_pre (Type &o) { - this->externalEndpoint_pre (const_cast <Type const &> (o)); } - virtual void externalEndpoint_pre (Type const&); - virtual void + virtual void externalEndpoint_next (Type &o) { - this->externalEndpoint_next (const_cast <Type const &> (o)); } - virtual void externalEndpoint_next (Type const&); - virtual void + virtual void externalEndpoint_post (Type &o) { - this->externalEndpoint_post (const_cast <Type const &> (o)); } - virtual void externalEndpoint_post (Type const&); - virtual void + virtual void externalReference_pre (Type &o) { - this->externalReference_pre (const_cast <Type const &> (o)); } - virtual void externalReference_pre (Type const&); - virtual void + virtual void externalReference_next (Type &o) { - this->externalReference_next (const_cast <Type const &> (o)); } - virtual void externalReference_next (Type const&); - virtual void + virtual void externalReference_post (Type &o) { - this->externalReference_post (const_cast <Type const &> (o)); } - virtual void externalReference_post (Type const&); @@ -8713,12 +8215,12 @@ namespace CIAO AssemblyConnectionDescription (); }; - struct PlanLocalityKind : Traversal::PlanLocalityKind, + struct PlanLocalityKind : Traversal::PlanLocalityKind, virtual ::XSCRT::Writer< ACE_TCHAR > { PlanLocalityKind (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { this->traverse (const_cast <Type const &> (o)); @@ -8731,42 +8233,36 @@ namespace CIAO PlanLocalityKind (); }; - struct PlanLocality : Traversal::PlanLocality, + struct PlanLocality : Traversal::PlanLocality, virtual ::XSCRT::Writer< ACE_TCHAR > { typedef ::CIAO::Config_Handlers::PlanLocality Type; PlanLocality (::XSCRT::XML::Element< ACE_TCHAR >&); - virtual void + virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); - virtual void + virtual void constraint (Type &o) { - this->constraint (const_cast <Type const &> (o)); } - virtual void constraint (Type const&); - virtual void + virtual void constrainedInstance (Type &o) { - this->constrainedInstance (const_cast <Type const &> (o)); } - virtual void constrainedInstance (Type const&); diff --git a/CIAO/tools/Config_Handlers/DD_Handler.cpp b/CIAO/tools/Config_Handlers/DD_Handler.cpp index ee9fbd79012..2eaefe4e205 100644 --- a/CIAO/tools/Config_Handlers/DD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/DD_Handler.cpp @@ -28,7 +28,7 @@ namespace CIAO throw DD_Handler::NoDomain (); Domain *dm = - new Domain (domain (dom)); + new Domain (reader::domain (dom)); // Domain d = domain (dom); diff --git a/CIAO/tools/Config_Handlers/Deployment.cpp b/CIAO/tools/Config_Handlers/Deployment.cpp index 8884b13c108..9d7ed2471f4 100644 --- a/CIAO/tools/Config_Handlers/Deployment.cpp +++ b/CIAO/tools/Config_Handlers/Deployment.cpp @@ -35,131 +35,155 @@ namespace CIAO { namespace Config_Handlers { - ::CIAO::Config_Handlers::Domain - domain (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "domain") + ::CIAO::Config_Handlers::Domain + domain (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::Domain r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "domain") + { + ::CIAO::Config_Handlers::Domain r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::deploymentPlan - DeploymentPlan (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "DeploymentPlan") + ::CIAO::Config_Handlers::deploymentPlan + DeploymentPlan (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::deploymentPlan r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "DeploymentPlan") + { + ::CIAO::Config_Handlers::deploymentPlan r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::ImplementationArtifactDescription - implementationArtifactDescription (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "implementationArtifactDescription") + ::CIAO::Config_Handlers::ImplementationArtifactDescription + implementationArtifactDescription (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "implementationArtifactDescription") + { + ::CIAO::Config_Handlers::ImplementationArtifactDescription r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::ComponentInterfaceDescription - componentInterfaceDescription (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "componentInterfaceDescription") + ::CIAO::Config_Handlers::ComponentInterfaceDescription + componentInterfaceDescription (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "componentInterfaceDescription") + { + ::CIAO::Config_Handlers::ComponentInterfaceDescription r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::ComponentImplementationDescription - componentImplementationDescription (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "componentImplementationDescription") + ::CIAO::Config_Handlers::ComponentImplementationDescription + componentImplementationDescription (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::ComponentImplementationDescription r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "componentImplementationDescription") + { + ::CIAO::Config_Handlers::ComponentImplementationDescription r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::ComponentPackageDescription - componentPackageDescription (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "componentPackageDescription") + ::CIAO::Config_Handlers::ComponentPackageDescription + componentPackageDescription (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::ComponentPackageDescription r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "componentPackageDescription") + { + ::CIAO::Config_Handlers::ComponentPackageDescription r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::PackageConfiguration - packageConfiguration (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "packageConfiguration") + ::CIAO::Config_Handlers::PackageConfiguration + packageConfiguration (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::PackageConfiguration r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "packageConfiguration") + { + ::CIAO::Config_Handlers::PackageConfiguration r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } - ::CIAO::Config_Handlers::TopLevelPackageDescription - topLevelPackageDescription (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "topLevelPackageDescription") + ::CIAO::Config_Handlers::TopLevelPackageDescription + topLevelPackageDescription (xercesc::DOMDocument const* d) { - ::CIAO::Config_Handlers::TopLevelPackageDescription r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "topLevelPackageDescription") + { + ::CIAO::Config_Handlers::TopLevelPackageDescription r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } } @@ -202,530 +226,554 @@ namespace CIAO { namespace Config_Handlers { - void - domain (::CIAO::Config_Handlers::Domain const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "domain") + void + domain (::CIAO::Config_Handlers::Domain const& s, xercesc::DOMDocument* d) { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::Domain, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::Node, - virtual ::CIAO::Config_Handlers::Writer::Interconnect, - virtual ::CIAO::Config_Handlers::Writer::Bridge, - virtual ::CIAO::Config_Handlers::Writer::Resource, - virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, - virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::SharedResource, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::XSCRT::Writer< ACE_TCHAR > - { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "domain") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::Domain, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::Node, + virtual ::CIAO::Config_Handlers::Writer::Interconnect, + virtual ::CIAO::Config_Handlers::Writer::Bridge, + virtual ::CIAO::Config_Handlers::Writer::Resource, + virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, + virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::SharedResource, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - DeploymentPlan (::CIAO::Config_Handlers::deploymentPlan const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "DeploymentPlan") - { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::deploymentPlan, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, - virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, - virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, - virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription, - virtual ::CIAO::Config_Handlers::Writer::IdRef, - virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::Requirement, - virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription, - virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription, - virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, - virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, - virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription, - virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, - virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription, - virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription, - virtual ::CIAO::Config_Handlers::Writer::PlanLocality, - virtual ::CIAO::Config_Handlers::Writer::PlanLocalityKind, - virtual ::XSCRT::Writer< ACE_TCHAR > + void + DeploymentPlan (::CIAO::Config_Handlers::deploymentPlan const& s, xercesc::DOMDocument* d) { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "DeploymentPlan") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::deploymentPlan, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, + virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, + virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, + virtual ::CIAO::Config_Handlers::Writer::MonolithicDeploymentDescription, + virtual ::CIAO::Config_Handlers::Writer::IdRef, + virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::Requirement, + virtual ::CIAO::Config_Handlers::Writer::InstanceDeploymentDescription, + virtual ::CIAO::Config_Handlers::Writer::InstanceResourceDeploymentDescription, + virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, + virtual ::CIAO::Config_Handlers::Writer::PlanConnectionDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::PlanSubcomponentPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, + virtual ::CIAO::Config_Handlers::Writer::ConnectionResourceDeploymentDescription, + virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, + virtual ::CIAO::Config_Handlers::Writer::ArtifactDeploymentDescription, + virtual ::CIAO::Config_Handlers::Writer::ResourceDeploymentDescription, + virtual ::CIAO::Config_Handlers::Writer::PlanLocality, + virtual ::CIAO::Config_Handlers::Writer::PlanLocalityKind, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "implementationArtifactDescription") - { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::Requirement, - virtual ::XSCRT::Writer< ACE_TCHAR > + void + implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s, xercesc::DOMDocument* d) { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "implementationArtifactDescription") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::Requirement, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "componentInterfaceDescription") - { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, - virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, - virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, - virtual ::XSCRT::Writer< ACE_TCHAR > + void + componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s, xercesc::DOMDocument* d) { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "componentInterfaceDescription") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, + virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, + virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "componentImplementationDescription") - { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, - virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, - virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, - virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, - virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, - virtual ::CIAO::Config_Handlers::Writer::Requirement, - virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::IdRef, - virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, - virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, - virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, - virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, - virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, - virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, - virtual ::CIAO::Config_Handlers::Writer::Capability, - virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, - virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, - virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, - virtual ::XSCRT::Writer< ACE_TCHAR > + void + componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s, xercesc::DOMDocument* d) { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "componentImplementationDescription") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, + virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, + virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, + virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, + virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, + virtual ::CIAO::Config_Handlers::Writer::Requirement, + virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::IdRef, + virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, + virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, + virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, + virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, + virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, + virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, + virtual ::CIAO::Config_Handlers::Writer::Capability, + virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, + virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, + virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "componentPackageDescription") + void + componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s, xercesc::DOMDocument* d) { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, - virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, - virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, - virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, - virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, - virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, - virtual ::CIAO::Config_Handlers::Writer::Requirement, - virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::IdRef, - virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, - virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, - virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, - virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, - virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, - virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, - virtual ::CIAO::Config_Handlers::Writer::Capability, - virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, - virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, - virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, - virtual ::XSCRT::Writer< ACE_TCHAR > - { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "componentPackageDescription") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, + virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, + virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, + virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, + virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, + virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, + virtual ::CIAO::Config_Handlers::Writer::Requirement, + virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::IdRef, + virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, + virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, + virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, + virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, + virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, + virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, + virtual ::CIAO::Config_Handlers::Writer::Capability, + virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, + virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, + virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "packageConfiguration") - { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, - virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, - virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, - virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, - virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, - virtual ::CIAO::Config_Handlers::Writer::Requirement, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, - virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::IdRef, - virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, - virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, - virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, - virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, - virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, - virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, - virtual ::CIAO::Config_Handlers::Writer::Capability, - virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, - virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, - virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, - virtual ::XSCRT::Writer< ACE_TCHAR > + void + packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s, xercesc::DOMDocument* d) { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "packageConfiguration") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, + virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, + virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, + virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, + virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, + virtual ::CIAO::Config_Handlers::Writer::Requirement, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, + virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::IdRef, + virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, + virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, + virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, + virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, + virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, + virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, + virtual ::CIAO::Config_Handlers::Writer::Capability, + virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, + virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, + virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } - void - topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "topLevelPackageDescription") + void + topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s, xercesc::DOMDocument* d) { - throw 1; - } - - struct W : virtual ::CIAO::Config_Handlers::Writer::TopLevelPackageDescription, - virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, - virtual ::CIAO::Config_Handlers::Writer::Property, - virtual ::CIAO::Config_Handlers::Writer::Any, - virtual ::CIAO::Config_Handlers::Writer::DataType, - virtual ::CIAO::Config_Handlers::Writer::TCKind, - virtual ::CIAO::Config_Handlers::Writer::EnumType, - virtual ::CIAO::Config_Handlers::Writer::StructType, - virtual ::CIAO::Config_Handlers::Writer::StructMemberType, - virtual ::CIAO::Config_Handlers::Writer::ValueType, - virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, - virtual ::CIAO::Config_Handlers::Writer::SequenceType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::AliasType, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::DataValue, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::NamedValue, - virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, - virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, - virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, - virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, - virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, - virtual ::CIAO::Config_Handlers::Writer::Requirement, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, - virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, - virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::IdRef, - virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, - virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, - virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, - virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, - virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, - virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, - virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, - virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, - virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, - virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, - virtual ::CIAO::Config_Handlers::Writer::Capability, - virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, - virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, - virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, - virtual ::XSCRT::Writer< ACE_TCHAR > - { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "topLevelPackageDescription") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::CIAO::Config_Handlers::Writer::TopLevelPackageDescription, + virtual ::CIAO::Config_Handlers::Writer::PackageConfiguration, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentInterfaceDescription, + virtual ::CIAO::Config_Handlers::Writer::Property, + virtual ::CIAO::Config_Handlers::Writer::Any, + virtual ::CIAO::Config_Handlers::Writer::DataType, + virtual ::CIAO::Config_Handlers::Writer::TCKind, + virtual ::CIAO::Config_Handlers::Writer::EnumType, + virtual ::CIAO::Config_Handlers::Writer::StructType, + virtual ::CIAO::Config_Handlers::Writer::StructMemberType, + virtual ::CIAO::Config_Handlers::Writer::ValueType, + virtual ::CIAO::Config_Handlers::Writer::ValueMemberType, + virtual ::CIAO::Config_Handlers::Writer::SequenceType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedInt, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::AliasType, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::DataValue, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::short_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedShort, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::float_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::double_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::boolean, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedByte, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::unsignedLong, ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::NamedValue, + virtual ::CIAO::Config_Handlers::Writer::ComponentPortDescription, + virtual ::CIAO::Config_Handlers::Writer::CCMComponentPortKind, + virtual ::CIAO::Config_Handlers::Writer::ComponentPropertyDescription, + virtual ::CIAO::Config_Handlers::Writer::PackagedComponentImplementation, + virtual ::CIAO::Config_Handlers::Writer::ComponentImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ComponentAssemblyDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentInstantiationDescription, + virtual ::CIAO::Config_Handlers::Writer::Requirement, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageReference, + virtual ::CIAO::Config_Handlers::Writer::ComponentPackageImport, + virtual ::CIAO::Config_Handlers::Writer::AssemblyConnectionDescription, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::IdRef, + virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, + virtual ::CIAO::Config_Handlers::Writer::ComponentExternalPortEndpoint, + virtual ::CIAO::Config_Handlers::Writer::ExternalReferenceEndpoint, + virtual ::CIAO::Config_Handlers::Writer::AssemblyPropertyMapping, + virtual ::CIAO::Config_Handlers::Writer::SubcomponentPropertyReference, + virtual ::CIAO::Config_Handlers::Writer::MonolithicImplementationDescription, + virtual ::CIAO::Config_Handlers::Writer::ImplementationRequirement, + virtual ::CIAO::Config_Handlers::Writer::ResourceUsageKind, + virtual ::CIAO::Config_Handlers::Writer::NamedImplementationArtifact, + virtual ::CIAO::Config_Handlers::Writer::ImplementationArtifactDescription, + virtual ::CIAO::Config_Handlers::Writer::Capability, + virtual ::CIAO::Config_Handlers::Writer::SatisfierProperty, + virtual ::CIAO::Config_Handlers::Writer::SatisfierPropertyKind, + virtual ::CIAO::Config_Handlers::Writer::ImplementationDependency, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } } } diff --git a/CIAO/tools/Config_Handlers/Deployment.hpp b/CIAO/tools/Config_Handlers/Deployment.hpp index d502c9b534a..a2f7a092cd8 100644 --- a/CIAO/tools/Config_Handlers/Deployment.hpp +++ b/CIAO/tools/Config_Handlers/Deployment.hpp @@ -53,37 +53,68 @@ namespace CIAO { namespace Config_Handlers { - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::Domain - domain (xercesc::DOMDocument const*); + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::Domain + domain (xercesc::DOMDocument const*); + } + + + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::deploymentPlan + DeploymentPlan (xercesc::DOMDocument const*); + } - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::deploymentPlan - DeploymentPlan (xercesc::DOMDocument const*); - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::ImplementationArtifactDescription - implementationArtifactDescription (xercesc::DOMDocument const*); + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ImplementationArtifactDescription + implementationArtifactDescription (xercesc::DOMDocument const*); + } - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::ComponentInterfaceDescription - componentInterfaceDescription (xercesc::DOMDocument const*); - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::ComponentImplementationDescription - componentImplementationDescription (xercesc::DOMDocument const*); + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ComponentInterfaceDescription + componentInterfaceDescription (xercesc::DOMDocument const*); + } - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::ComponentPackageDescription - componentPackageDescription (xercesc::DOMDocument const*); - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::PackageConfiguration - packageConfiguration (xercesc::DOMDocument const*); + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ComponentImplementationDescription + componentImplementationDescription (xercesc::DOMDocument const*); + } - XSC_XML_Handlers_Export - ::CIAO::Config_Handlers::TopLevelPackageDescription - topLevelPackageDescription (xercesc::DOMDocument const*); + + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::ComponentPackageDescription + componentPackageDescription (xercesc::DOMDocument const*); + } + + + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::PackageConfiguration + packageConfiguration (xercesc::DOMDocument const*); + } + + + namespace reader + { + XSC_XML_Handlers_Export + ::CIAO::Config_Handlers::TopLevelPackageDescription + topLevelPackageDescription (xercesc::DOMDocument const*); + } } } @@ -115,37 +146,68 @@ namespace CIAO { namespace Config_Handlers { - XSC_XML_Handlers_Export - void - domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*); + namespace writer + { + XSC_XML_Handlers_Export + void + domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*); + } + + + namespace writer + { + XSC_XML_Handlers_Export + void + DeploymentPlan (::CIAO::Config_Handlers::deploymentPlan const&, xercesc::DOMDocument*); + } - XSC_XML_Handlers_Export - void - DeploymentPlan (::CIAO::Config_Handlers::deploymentPlan const&, xercesc::DOMDocument*); - XSC_XML_Handlers_Export - void - implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*); + namespace writer + { + XSC_XML_Handlers_Export + void + implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*); + } - XSC_XML_Handlers_Export - void - componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*); - XSC_XML_Handlers_Export - void - componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*); + namespace writer + { + XSC_XML_Handlers_Export + void + componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*); + } - XSC_XML_Handlers_Export - void - componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*); - XSC_XML_Handlers_Export - void - packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*); + namespace writer + { + XSC_XML_Handlers_Export + void + componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*); + } - XSC_XML_Handlers_Export - void - topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*); + + namespace writer + { + XSC_XML_Handlers_Export + void + componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*); + } + + + namespace writer + { + XSC_XML_Handlers_Export + void + packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*); + } + + + namespace writer + { + XSC_XML_Handlers_Export + void + topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*); + } } } diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/CIAO/tools/Config_Handlers/IDD_Handler.cpp index 5ea8f82952e..1a41f5e0896 100644 --- a/CIAO/tools/Config_Handlers/IDD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/IDD_Handler.cpp @@ -49,9 +49,9 @@ namespace CIAO dest.name = src.name ().c_str (); dest.node = src.node ().c_str (); - if (src.xmi_id_p ()) + if (src.id_p ()) { - ACE_CString cstr (src.xmi_id ().c_str ()); + ACE_CString cstr (src.id ().c_str ()); IDD_Handler::IDREF.bind_ref (cstr, pos); } else @@ -159,7 +159,7 @@ namespace CIAO // Bind the ref and set it in the IDD IDD_Handler::IDREF.bind_next_available (idd_id); - idd.xmi_id (xml_id); + idd.id (xml_id); return idd; } diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/CIAO/tools/Config_Handlers/MDD_Handler.cpp index 36ce5d55e69..0ec6db132e3 100644 --- a/CIAO/tools/Config_Handlers/MDD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/MDD_Handler.cpp @@ -95,9 +95,9 @@ namespace CIAO Requirement_Functor (toconfig.deployRequirement)); // Handle the idref - if (desc.xmi_id_p ()) + if (desc.id_p ()) { - ACE_CString cstr (desc.xmi_id ().c_str ()); + ACE_CString cstr (desc.id ().c_str ()); MDD_Handler::IDREF.bind_ref (cstr, pos); } @@ -166,7 +166,7 @@ namespace CIAO // Bind the ref and set it in the IDD MDD_Handler::IDREF.bind_next_available (mdd_id); - mdd.xmi_id (xml_id); + mdd.id (xml_id); return mdd; } diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp index f4bca5f8248..263afb03c0e 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp @@ -378,7 +378,7 @@ namespace CIAO try { return new ComponentImplementationDescription - (componentImplementationDescription (dom)); + (reader::componentImplementationDescription (dom)); } catch (...) { throw Parse_Error ("Unable to create XSC structure for CID"); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp index e39d5ced065..af543ba77eb 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp @@ -147,7 +147,7 @@ namespace CIAO try { //ACE_ERROR ((LM_ERROR, "Creating new CPD XSC Object\n")); - return new ComponentPackageDescription (componentPackageDescription (dom)); + return new ComponentPackageDescription (reader::componentPackageDescription (dom)); } catch (...) { throw Parse_Error ("Unable to create XSC structure for CID"); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp index 06264e649c9..7a084ff316b 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp @@ -155,7 +155,7 @@ namespace CIAO try { return new ComponentInterfaceDescription - (componentInterfaceDescription (dom)); + (reader::componentInterfaceDescription (dom)); } catch (...) { throw Parse_Error ("Unable to create XSC structure for Component Interface Description"); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp index e16a5c63ae8..ba9f4a1db94 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp @@ -112,7 +112,7 @@ namespace CIAO try { return new ImplementationArtifactDescription - (implementationArtifactDescription (dom)); + (reader::implementationArtifactDescription (dom)); } catch (...) { throw Parse_Error ("Unable to create XSC structure for IAD"); diff --git a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp index c7e82624f3d..efc823fe539 100644 --- a/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp +++ b/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp @@ -41,7 +41,7 @@ namespace CIAO { TopLevelPackageDescription tpd; - tpd = topLevelPackageDescription (dom); + tpd = reader::topLevelPackageDescription (dom); PCD_Handler::package_config (*tpd.begin_basePackage (), toconfig); @@ -49,7 +49,7 @@ namespace CIAO else if (root == XStr ("Deployment:packageConfiguration")) { PackageConfiguration pcd; - pcd = packageConfiguration (dom); + pcd = reader::packageConfiguration (dom); PCD_Handler::package_config (pcd, toconfig); } else @@ -151,7 +151,7 @@ namespace CIAO throw Parse_Error ("Unable to create DOM for PackageConfiguration"); try { - return new PackageConfiguration (packageConfiguration (dom)); + return new PackageConfiguration (reader::packageConfiguration (dom)); } catch (...) { throw Parse_Error ("Unable to create XSC structure for PackageConfiguration"); diff --git a/CIAO/tools/Config_Handlers/XMI.cpp b/CIAO/tools/Config_Handlers/XMI.cpp index ce54bf47d87..57a20214e1e 100644 --- a/CIAO/tools/Config_Handlers/XMI.cpp +++ b/CIAO/tools/Config_Handlers/XMI.cpp @@ -30,10 +30,9 @@ namespace XMI } Extension:: - Extension (::XMI::Extension const& s) - : - XSCRT::Type (), - xmi_id_ (s.xmi_id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.xmi_id_) : 0), + Extension (Extension const& s) + : + id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), uuid_ (s.uuid_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.uuid_) : 0), href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0), @@ -43,7 +42,7 @@ namespace XMI extenderID_ (s.extenderID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.extenderID_) : 0), regulator__ () { - if (xmi_id_.get ()) xmi_id_->container (this); + if (id_.get ()) id_->container (this); if (label_.get ()) label_->container (this); if (uuid_.get ()) uuid_->container (this); if (href_.get ()) href_->container (this); @@ -53,11 +52,11 @@ namespace XMI if (extenderID_.get ()) extenderID_->container (this); } - ::XMI::Extension& Extension:: - operator= (::XMI::Extension const& s) + Extension& Extension:: + operator= (Extension const& s) { - 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); if (s.label_.get ()) label (*(s.label_)); else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); @@ -87,35 +86,35 @@ namespace XMI // Extension // bool Extension:: - xmi_id_p () const + id_p () const { - return xmi_id_.get () != 0; + return id_.get () != 0; } ::XMLSchema::ID< ACE_TCHAR > const& Extension:: - xmi_id () const + id () const { - return *xmi_id_; + return *id_; } ::XMLSchema::ID< ACE_TCHAR >& Extension:: - xmi_id () + id () { - return *xmi_id_; + return *id_; } void Extension:: - 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); } } @@ -381,10 +380,10 @@ namespace XMI { ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ()); ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ())); - if (n == "xmi_id") + if (n == "id") { ::XMLSchema::ID< ACE_TCHAR > t (a); - xmi_id (t); + id (t); } else if (n == "label") @@ -438,19 +437,22 @@ namespace XMI namespace XMI { - ::XMI::Extension - extension (xercesc::DOMDocument const* d) + namespace reader { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () == "extension") + ::XMI::Extension + extension (xercesc::DOMDocument const* d) { - ::XMI::Extension r (e); - return r; - } + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () == "extension") + { + ::XMI::Extension r (e); + return r; + } - else - { - throw 1; + else + { + throw 1; + } } } } @@ -467,7 +469,7 @@ namespace XMI { ExtensionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Extension)); + ::XSCRT::TypeId id (typeid (::XMI::Extension)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -491,8 +493,8 @@ namespace XMI traverse (Type& o) { pre (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); if (o.label_p ()) label (o); else label_none (o); if (o.uuid_p ()) uuid (o); @@ -514,8 +516,8 @@ namespace XMI traverse (Type const& o) { pre (o); - if (o.xmi_id_p ()) xmi_id (o); - else xmi_id_none (o); + if (o.id_p ()) id (o); + else id_none (o); if (o.label_p ()) label (o); else label_none (o); if (o.uuid_p ()) uuid (o); @@ -544,24 +546,24 @@ namespace XMI } void Extension:: - xmi_id (Type& o) + id (Type& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void Extension:: - xmi_id (Type const& o) + id (Type const& o) { - dispatch (o.xmi_id ()); + dispatch (o.id ()); } void Extension:: - xmi_id_none (Type&) + id_none (Type&) { } void Extension:: - xmi_id_none (Type const&) + id_none (Type const&) { } @@ -757,11 +759,11 @@ namespace XMI } void Extension:: - xmi_id (Type const& o) + id (Type const& o) { - ::XSCRT::XML::Attribute< ACE_TCHAR > a ("xmi_id", "http://www.omg.org/XMI", "", top_ ()); + ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/XMI", "", top_ ()); attr_ (&a); - Traversal::Extension::xmi_id (o); + Traversal::Extension::id (o); attr_ (0); } @@ -832,29 +834,32 @@ namespace XMI namespace XMI { - void - extension (::XMI::Extension const& s, xercesc::DOMDocument* d) + namespace writer { - ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); - if (e.name () != "extension") + void + extension (::XMI::Extension const& s, xercesc::DOMDocument* d) { - throw 1; - } - - struct W : virtual ::XMI::Writer::Extension, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, - virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, - virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, - virtual ::XSCRT::Writer< ACE_TCHAR > - { - W (::XSCRT::XML::Element< ACE_TCHAR >& e) - : ::XSCRT::Writer< ACE_TCHAR > (e) + ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ()); + if (e.name () != "extension") { + throw 1; } - }; - W w (e); - w.dispatch (s); + struct W : virtual ::XMI::Writer::Extension, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >, + virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >, + virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, + virtual ::XSCRT::Writer< ACE_TCHAR > + { + W (::XSCRT::XML::Element< ACE_TCHAR >& e) + : ::XSCRT::Writer< ACE_TCHAR > (e) + { + } + }; + + W w (e); + w.dispatch (s); + } } } diff --git a/CIAO/tools/Config_Handlers/XMI.hpp b/CIAO/tools/Config_Handlers/XMI.hpp index e1ac06ab52c..b12495ef612 100644 --- a/CIAO/tools/Config_Handlers/XMI.hpp +++ b/CIAO/tools/Config_Handlers/XMI.hpp @@ -36,16 +36,16 @@ namespace XMI { typedef ::XSCRT::Type Base; - // xmi_id + // id // public: - bool xmi_id_p () const; - ::XMLSchema::ID< ACE_TCHAR > const& xmi_id () const; - ::XMLSchema::ID< ACE_TCHAR >& xmi_id (); - void xmi_id (::XMLSchema::ID< ACE_TCHAR > const& ); + bool id_p () const; + ::XMLSchema::ID< ACE_TCHAR > const& id () const; + ::XMLSchema::ID< ACE_TCHAR >& id (); + void id (::XMLSchema::ID< ACE_TCHAR > const& ); protected: - ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > xmi_id_; + ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > id_; // label // @@ -140,9 +140,12 @@ namespace XMI namespace XMI { - XSC_XML_Handlers_Export - ::XMI::Extension - extension (xercesc::DOMDocument const*); + namespace reader + { + XSC_XML_Handlers_Export + ::XMI::Extension + extension (xercesc::DOMDocument const*); + } } #include "XMLSchema/Traversal.hpp" @@ -166,16 +169,16 @@ namespace XMI pre (Type const&); virtual void - xmi_id (Type&); + id (Type&); virtual void - xmi_id (Type const&); + id (Type const&); virtual void - xmi_id_none (Type&); + id_none (Type&); virtual void - xmi_id_none (Type const&); + id_none (Type const&); virtual void label (Type&); @@ -285,99 +288,81 @@ namespace XMI virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void - xmi_id (Type &o) + id (Type &o) { - - this->xmi_id (const_cast <Type const &> (o)); + this->id (const_cast <Type const &> (o)); } - virtual void - xmi_id (Type const&); + id (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void uuid (Type &o) { - this->uuid (const_cast <Type const &> (o)); } - virtual void uuid (Type const&); virtual void href (Type &o) { - this->href (const_cast <Type const &> (o)); } - virtual void href (Type const&); virtual void idref (Type &o) { - this->idref (const_cast <Type const &> (o)); } - virtual void idref (Type const&); virtual void version (Type &o) { - this->version (const_cast <Type const &> (o)); } - virtual void version (Type const&); virtual void extender (Type &o) { - this->extender (const_cast <Type const &> (o)); } - virtual void extender (Type const&); virtual void extenderID (Type &o) { - this->extenderID (const_cast <Type const &> (o)); } - virtual void extenderID (Type const&); @@ -389,9 +374,12 @@ namespace XMI namespace XMI { - XSC_XML_Handlers_Export - void - extension (::XMI::Extension const&, xercesc::DOMDocument*); + namespace writer + { + XSC_XML_Handlers_Export + void + extension (::XMI::Extension const&, xercesc::DOMDocument*); + } } #endif // XMI_HPP diff --git a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/CIAO/tools/Config_Handlers/XML_File_Intf.cpp index f591abc89f0..274628f2aaf 100644 --- a/CIAO/tools/Config_Handlers/XML_File_Intf.cpp +++ b/CIAO/tools/Config_Handlers/XML_File_Intf.cpp @@ -49,7 +49,7 @@ namespace CIAO CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - " "Parsing XML file with XSC\n")); deploymentPlan dp = - DeploymentPlan (dom); + CIAO::Config_Handlers::reader::DeploymentPlan (dom); CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - " "Processing using config handlers\n")); diff --git a/CIAO/tools/Config_Handlers/ccd.cpp b/CIAO/tools/Config_Handlers/ccd.cpp index 64e40b82567..8bc254fcf79 100644 --- a/CIAO/tools/Config_Handlers/ccd.cpp +++ b/CIAO/tools/Config_Handlers/ccd.cpp @@ -33,12 +33,18 @@ namespace CIAO } ComponentInterfaceDescription:: - ComponentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s) + ComponentInterfaceDescription (ComponentInterfaceDescription const& s) : ::XSCRT::Type (), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0), specificType_ (s.specificType_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.specificType_) : 0), + supportedType_ (s.supportedType_), + idlFile_ (s.idlFile_), + configProperty_ (s.configProperty_), + port_ (s.port_), + property_ (s.property_), + infoProperty_ (s.infoProperty_), contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0), href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0), regulator__ () @@ -46,78 +52,44 @@ namespace CIAO if (label_.get ()) label_->container (this); if (UUID_.get ()) UUID_->container (this); if (specificType_.get ()) specificType_->container (this); - { - for (supportedType_const_iterator i (s.supportedType_.begin ());i != s.supportedType_.end ();++i) add_supportedType (*i); - } - - { - for (idlFile_const_iterator i (s.idlFile_.begin ());i != s.idlFile_.end ();++i) add_idlFile (*i); - } - - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } - - { - for (port_const_iterator i (s.port_.begin ());i != s.port_.end ();++i) add_port (*i); - } - - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } - - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } - if (contentLocation_.get ()) contentLocation_->container (this); if (href_.get ()) href_->container (this); } - ::CIAO::Config_Handlers::ComponentInterfaceDescription& ComponentInterfaceDescription:: - operator= (::CIAO::Config_Handlers::ComponentInterfaceDescription const& s) + ComponentInterfaceDescription& ComponentInterfaceDescription:: + operator= (ComponentInterfaceDescription const& s) { - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - 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_; - idlFile_.clear (); - { - for (idlFile_const_iterator i (s.idlFile_.begin ());i != s.idlFile_.end ();++i) add_idlFile (*i); - } + idlFile_ = s.idlFile_; - configProperty_.clear (); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } + configProperty_ = s.configProperty_; - port_.clear (); - { - for (port_const_iterator i (s.port_.begin ());i != s.port_.end ();++i) add_port (*i); - } + port_ = s.port_; - property_.clear (); - { - for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i); - } + property_ = s.property_; - infoProperty_.clear (); - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } + infoProperty_ = s.infoProperty_; - if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_)); - else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.contentLocation_.get ()) + contentLocation (*(s.contentLocation_)); + else + contentLocation_.reset (0); if (s.href_.get ()) href (*(s.href_)); else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); @@ -630,7 +602,7 @@ namespace CIAO { ComponentInterfaceDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentInterfaceDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentInterfaceDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -780,7 +752,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::supportedType_iterator b (o.begin_supportedType()), e (o.end_supportedType()); if (b != e) { @@ -802,7 +774,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::supportedType_const_iterator b (o.begin_supportedType()), e (o.end_supportedType()); if (b != e) { @@ -864,7 +836,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::idlFile_iterator b (o.begin_idlFile()), e (o.end_idlFile()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::idlFile_iterator b (o.begin_idlFile()), e (o.end_idlFile()); if (b != e) { @@ -886,7 +858,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::idlFile_const_iterator b (o.begin_idlFile()), e (o.end_idlFile()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::idlFile_const_iterator b (o.begin_idlFile()), e (o.end_idlFile()); if (b != e) { @@ -948,7 +920,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -970,7 +942,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -1032,7 +1004,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::port_iterator b (o.begin_port()), e (o.end_port()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::port_iterator b (o.begin_port()), e (o.end_port()); if (b != e) { @@ -1054,7 +1026,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::port_const_iterator b (o.begin_port()), e (o.end_port()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::port_const_iterator b (o.begin_port()), e (o.end_port()); if (b != e) { @@ -1116,7 +1088,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::property_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::property_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { @@ -1138,7 +1110,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::property_const_iterator b (o.begin_property()), e (o.end_property()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::property_const_iterator b (o.begin_property()), e (o.end_property()); if (b != e) { @@ -1200,7 +1172,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -1222,7 +1194,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentInterfaceDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ComponentInterfaceDescription::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/ccd.hpp b/CIAO/tools/Config_Handlers/ccd.hpp index bb3832af5a6..29478c69de3 100644 --- a/CIAO/tools/Config_Handlers/ccd.hpp +++ b/CIAO/tools/Config_Handlers/ccd.hpp @@ -495,264 +495,216 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void specificType (Type &o) { - this->specificType (const_cast <Type const &> (o)); } - virtual void specificType (Type const&); virtual void supportedType_pre (Type &o) { - this->supportedType_pre (const_cast <Type const &> (o)); } - virtual void supportedType_pre (Type const&); virtual void supportedType_next (Type &o) { - this->supportedType_next (const_cast <Type const &> (o)); } - virtual void supportedType_next (Type const&); virtual void supportedType_post (Type &o) { - this->supportedType_post (const_cast <Type const &> (o)); } - virtual void supportedType_post (Type const&); virtual void idlFile_pre (Type &o) { - this->idlFile_pre (const_cast <Type const &> (o)); } - virtual void idlFile_pre (Type const&); virtual void idlFile_next (Type &o) { - this->idlFile_next (const_cast <Type const &> (o)); } - virtual void idlFile_next (Type const&); virtual void idlFile_post (Type &o) { - this->idlFile_post (const_cast <Type const &> (o)); } - virtual void idlFile_post (Type const&); virtual void configProperty_pre (Type &o) { - this->configProperty_pre (const_cast <Type const &> (o)); } - virtual void configProperty_pre (Type const&); virtual void configProperty_next (Type &o) { - this->configProperty_next (const_cast <Type const &> (o)); } - virtual void configProperty_next (Type const&); virtual void configProperty_post (Type &o) { - this->configProperty_post (const_cast <Type const &> (o)); } - virtual void configProperty_post (Type const&); virtual void port_pre (Type &o) { - this->port_pre (const_cast <Type const &> (o)); } - virtual void port_pre (Type const&); virtual void port_next (Type &o) { - this->port_next (const_cast <Type const &> (o)); } - virtual void port_next (Type const&); virtual void port_post (Type &o) { - this->port_post (const_cast <Type const &> (o)); } - virtual void port_post (Type const&); virtual void property_pre (Type &o) { - this->property_pre (const_cast <Type const &> (o)); } - virtual void property_pre (Type const&); virtual void property_next (Type &o) { - this->property_next (const_cast <Type const &> (o)); } - virtual void property_next (Type const&); virtual void property_post (Type &o) { - this->property_post (const_cast <Type const &> (o)); } - virtual void property_post (Type const&); virtual void infoProperty_pre (Type &o) { - this->infoProperty_pre (const_cast <Type const &> (o)); } - virtual void infoProperty_pre (Type const&); virtual void infoProperty_next (Type &o) { - this->infoProperty_next (const_cast <Type const &> (o)); } - virtual void infoProperty_next (Type const&); virtual void infoProperty_post (Type &o) { - this->infoProperty_post (const_cast <Type const &> (o)); } - virtual void infoProperty_post (Type const&); virtual void contentLocation (Type &o) { - this->contentLocation (const_cast <Type const &> (o)); } - virtual void contentLocation (Type const&); virtual void href (Type &o) { - this->href (const_cast <Type const &> (o)); } - virtual void href (Type const&); diff --git a/CIAO/tools/Config_Handlers/cdd.cpp b/CIAO/tools/Config_Handlers/cdd.cpp index 799ad5ebec7..c7fb2380f87 100644 --- a/CIAO/tools/Config_Handlers/cdd.cpp +++ b/CIAO/tools/Config_Handlers/cdd.cpp @@ -25,77 +25,53 @@ namespace CIAO // Domain:: - Domain () + Domain (::std::list< ::CIAO::Config_Handlers::Node > const& node__) : ::XSCRT::Type (), + node_ (node__), regulator__ () { } Domain:: - Domain (::CIAO::Config_Handlers::Domain const& s) + Domain (Domain const& s) : ::XSCRT::Type (), UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), + node_ (s.node_), + interconnect_ (s.interconnect_), + bridge_ (s.bridge_), + sharedResource_ (s.sharedResource_), + infoProperty_ (s.infoProperty_), regulator__ () { if (UUID_.get ()) UUID_->container (this); if (label_.get ()) label_->container (this); - { - for (node_const_iterator i (s.node_.begin ());i != s.node_.end ();++i) add_node (*i); - } - - { - for (interconnect_const_iterator i (s.interconnect_.begin ());i != s.interconnect_.end ();++i) add_interconnect (*i); - } - - { - for (bridge_const_iterator i (s.bridge_.begin ());i != s.bridge_.end ();++i) add_bridge (*i); - } - - { - for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i); - } - - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } } - ::CIAO::Config_Handlers::Domain& Domain:: - operator= (::CIAO::Config_Handlers::Domain const& s) + Domain& Domain:: + operator= (Domain const& s) { - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - node_.clear (); - { - for (node_const_iterator i (s.node_.begin ());i != s.node_.end ();++i) add_node (*i); - } + node_ = s.node_; - interconnect_.clear (); - { - for (interconnect_const_iterator i (s.interconnect_.begin ());i != s.interconnect_.end ();++i) add_interconnect (*i); - } + interconnect_ = s.interconnect_; - bridge_.clear (); - { - for (bridge_const_iterator i (s.bridge_.begin ());i != s.bridge_.end ();++i) add_bridge (*i); - } + bridge_ = s.bridge_; - sharedResource_.clear (); - { - for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i); - } + sharedResource_ = s.sharedResource_; - infoProperty_.clear (); - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } + infoProperty_ = s.infoProperty_; return *this; } @@ -354,51 +330,43 @@ namespace CIAO // Bridge:: - Bridge (::XMLSchema::string< ACE_TCHAR > const& name__) + Bridge (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ::CIAO::Config_Handlers::Interconnect > const& connect__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), + connect_ (connect__), regulator__ () { name_->container (this); } Bridge:: - Bridge (::CIAO::Config_Handlers::Bridge const& s) + Bridge (Bridge const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), + connect_ (s.connect_), + resource_ (s.resource_), regulator__ () { name_->container (this); if (label_.get ()) label_->container (this); - { - for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i); - } - - { - for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i); - } } - ::CIAO::Config_Handlers::Bridge& Bridge:: - operator= (::CIAO::Config_Handlers::Bridge const& s) + Bridge& Bridge:: + operator= (Bridge const& s) { - name (s.name ()); + name (*s.name_); - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - connect_.clear (); - { - for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i); - } + connect_ = s.connect_; - resource_.clear (); - { - for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i); - } + resource_ = s.resource_; return *this; } @@ -528,60 +496,46 @@ namespace CIAO // Interconnect:: - Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__) + Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ::CIAO::Config_Handlers::Node > const& connect__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), + connect_ (connect__), regulator__ () { name_->container (this); } Interconnect:: - Interconnect (::CIAO::Config_Handlers::Interconnect const& s) + Interconnect (Interconnect const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), + connection_ (s.connection_), + connect_ (s.connect_), + resource_ (s.resource_), regulator__ () { name_->container (this); if (label_.get ()) label_->container (this); - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } - - { - for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i); - } - - { - for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i); - } } - ::CIAO::Config_Handlers::Interconnect& Interconnect:: - operator= (::CIAO::Config_Handlers::Interconnect const& s) + Interconnect& Interconnect:: + operator= (Interconnect const& s) { - name (s.name ()); + name (*s.name_); - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - connection_.clear (); - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } + connection_ = s.connection_; - connect_.clear (); - { - for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i); - } + connect_ = s.connect_; - resource_.clear (); - { - for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i); - } + resource_ = s.resource_; return *this; } @@ -751,7 +705,6 @@ namespace CIAO Node:: Node (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -759,50 +712,35 @@ namespace CIAO } Node:: - Node (::CIAO::Config_Handlers::Node const& s) + Node (Node const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), + connection_ (s.connection_), + sharedResource_ (s.sharedResource_), + resource_ (s.resource_), regulator__ () { name_->container (this); if (label_.get ()) label_->container (this); - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } - - { - for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i); - } - - { - for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i); - } } - ::CIAO::Config_Handlers::Node& Node:: - operator= (::CIAO::Config_Handlers::Node const& s) + Node& Node:: + operator= (Node const& s) { - name (s.name ()); + name (*s.name_); - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - connection_.clear (); - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } + connection_ = s.connection_; - sharedResource_.clear (); - { - for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i); - } + sharedResource_ = s.sharedResource_; - resource_.clear (); - { - for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i); - } + resource_ = s.resource_; return *this; } @@ -975,7 +913,6 @@ namespace CIAO ::CIAO::Config_Handlers::Node const& node__, ::CIAO::Config_Handlers::SatisfierProperty const& property__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)), node_ (new ::CIAO::Config_Handlers::Node (node__)), @@ -989,7 +926,7 @@ namespace CIAO } SharedResource:: - SharedResource (::CIAO::Config_Handlers::SharedResource const& s) + SharedResource (SharedResource const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -1004,16 +941,16 @@ namespace CIAO property_->container (this); } - ::CIAO::Config_Handlers::SharedResource& SharedResource:: - operator= (::CIAO::Config_Handlers::SharedResource const& s) + SharedResource& SharedResource:: + operator= (SharedResource const& s) { - name (s.name ()); + name (*s.name_); - resourceType (s.resourceType ()); + resourceType (*s.resourceType_); - node (s.node ()); + node (*s.node_); - property (s.property ()); + property (*s.property_); return *this; } @@ -1359,7 +1296,7 @@ namespace CIAO { DomainTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Domain)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Domain)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1373,7 +1310,7 @@ namespace CIAO { BridgeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Bridge)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Bridge)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1387,7 +1324,7 @@ namespace CIAO { InterconnectTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Interconnect)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Interconnect)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1401,7 +1338,7 @@ namespace CIAO { NodeTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (Node)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::Node)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1415,7 +1352,7 @@ namespace CIAO { SharedResourceTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (SharedResource)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::SharedResource)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1529,7 +1466,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::node_iterator b (o.begin_node()), e (o.end_node()); + ::CIAO::Config_Handlers::Domain::node_iterator b (o.begin_node()), e (o.end_node()); if (b != e) { @@ -1549,7 +1486,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::node_const_iterator b (o.begin_node()), e (o.end_node()); + ::CIAO::Config_Handlers::Domain::node_const_iterator b (o.begin_node()), e (o.end_node()); if (b != e) { @@ -1599,7 +1536,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::interconnect_iterator b (o.begin_interconnect()), e (o.end_interconnect()); + ::CIAO::Config_Handlers::Domain::interconnect_iterator b (o.begin_interconnect()), e (o.end_interconnect()); if (b != e) { @@ -1621,7 +1558,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::interconnect_const_iterator b (o.begin_interconnect()), e (o.end_interconnect()); + ::CIAO::Config_Handlers::Domain::interconnect_const_iterator b (o.begin_interconnect()), e (o.end_interconnect()); if (b != e) { @@ -1683,7 +1620,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::bridge_iterator b (o.begin_bridge()), e (o.end_bridge()); + ::CIAO::Config_Handlers::Domain::bridge_iterator b (o.begin_bridge()), e (o.end_bridge()); if (b != e) { @@ -1705,7 +1642,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::bridge_const_iterator b (o.begin_bridge()), e (o.end_bridge()); + ::CIAO::Config_Handlers::Domain::bridge_const_iterator b (o.begin_bridge()), e (o.end_bridge()); if (b != e) { @@ -1767,7 +1704,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); + ::CIAO::Config_Handlers::Domain::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); if (b != e) { @@ -1789,7 +1726,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); + ::CIAO::Config_Handlers::Domain::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); if (b != e) { @@ -1851,7 +1788,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::Domain::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -1873,7 +1810,7 @@ namespace CIAO { // VC6 anathema strikes again // - Domain::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::Domain::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -2017,7 +1954,7 @@ namespace CIAO { // VC6 anathema strikes again // - Bridge::Type::connect_iterator b (o.begin_connect()), e (o.end_connect()); + ::CIAO::Config_Handlers::Bridge::connect_iterator b (o.begin_connect()), e (o.end_connect()); if (b != e) { @@ -2037,7 +1974,7 @@ namespace CIAO { // VC6 anathema strikes again // - Bridge::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect()); + ::CIAO::Config_Handlers::Bridge::connect_const_iterator b (o.begin_connect()), e (o.end_connect()); if (b != e) { @@ -2087,7 +2024,7 @@ namespace CIAO { // VC6 anathema strikes again // - Bridge::Type::resource_iterator b (o.begin_resource()), e (o.end_resource()); + ::CIAO::Config_Handlers::Bridge::resource_iterator b (o.begin_resource()), e (o.end_resource()); if (b != e) { @@ -2109,7 +2046,7 @@ namespace CIAO { // VC6 anathema strikes again // - Bridge::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource()); + ::CIAO::Config_Handlers::Bridge::resource_const_iterator b (o.begin_resource()), e (o.end_resource()); if (b != e) { @@ -2255,7 +2192,7 @@ namespace CIAO { // VC6 anathema strikes again // - Interconnect::Type::connection_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::Interconnect::connection_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -2277,7 +2214,7 @@ namespace CIAO { // VC6 anathema strikes again // - Interconnect::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::Interconnect::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -2339,7 +2276,7 @@ namespace CIAO { // VC6 anathema strikes again // - Interconnect::Type::connect_iterator b (o.begin_connect()), e (o.end_connect()); + ::CIAO::Config_Handlers::Interconnect::connect_iterator b (o.begin_connect()), e (o.end_connect()); if (b != e) { @@ -2359,7 +2296,7 @@ namespace CIAO { // VC6 anathema strikes again // - Interconnect::Type::connect_const_iterator b (o.begin_connect()), e (o.end_connect()); + ::CIAO::Config_Handlers::Interconnect::connect_const_iterator b (o.begin_connect()), e (o.end_connect()); if (b != e) { @@ -2409,7 +2346,7 @@ namespace CIAO { // VC6 anathema strikes again // - Interconnect::Type::resource_iterator b (o.begin_resource()), e (o.end_resource()); + ::CIAO::Config_Handlers::Interconnect::resource_iterator b (o.begin_resource()), e (o.end_resource()); if (b != e) { @@ -2431,7 +2368,7 @@ namespace CIAO { // VC6 anathema strikes again // - Interconnect::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource()); + ::CIAO::Config_Handlers::Interconnect::resource_const_iterator b (o.begin_resource()), e (o.end_resource()); if (b != e) { @@ -2577,7 +2514,7 @@ namespace CIAO { // VC6 anathema strikes again // - Node::Type::connection_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::Node::connection_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -2599,7 +2536,7 @@ namespace CIAO { // VC6 anathema strikes again // - Node::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::Node::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -2661,7 +2598,7 @@ namespace CIAO { // VC6 anathema strikes again // - Node::Type::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); + ::CIAO::Config_Handlers::Node::sharedResource_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); if (b != e) { @@ -2683,7 +2620,7 @@ namespace CIAO { // VC6 anathema strikes again // - Node::Type::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); + ::CIAO::Config_Handlers::Node::sharedResource_const_iterator b (o.begin_sharedResource()), e (o.end_sharedResource()); if (b != e) { @@ -2745,7 +2682,7 @@ namespace CIAO { // VC6 anathema strikes again // - Node::Type::resource_iterator b (o.begin_resource()), e (o.end_resource()); + ::CIAO::Config_Handlers::Node::resource_iterator b (o.begin_resource()), e (o.end_resource()); if (b != e) { @@ -2767,7 +2704,7 @@ namespace CIAO { // VC6 anathema strikes again // - Node::Type::resource_const_iterator b (o.begin_resource()), e (o.end_resource()); + ::CIAO::Config_Handlers::Node::resource_const_iterator b (o.begin_resource()), e (o.end_resource()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/cdd.hpp b/CIAO/tools/Config_Handlers/cdd.hpp index 65c90942c53..2ee6ed92471 100644 --- a/CIAO/tools/Config_Handlers/cdd.hpp +++ b/CIAO/tools/Config_Handlers/cdd.hpp @@ -143,7 +143,7 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_; public: - Domain (); + Domain (::std::list< ::CIAO::Config_Handlers::Node > const& node__); Domain (::XSCRT::XML::Element< ACE_TCHAR > const&); Domain (Domain const& s); @@ -210,7 +210,8 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Resource > resource_; public: - Bridge (::XMLSchema::string< ACE_TCHAR > const& name__); + Bridge (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ::CIAO::Config_Handlers::Interconnect > const& connect__); Bridge (::XSCRT::XML::Element< ACE_TCHAR > const&); Bridge (Bridge const& s); @@ -292,7 +293,8 @@ namespace CIAO ::std::list< ::CIAO::Config_Handlers::Resource > resource_; public: - Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__); + Interconnect (::XMLSchema::string< ACE_TCHAR > const& name__, + ::std::list< ::CIAO::Config_Handlers::Node > const& connect__); Interconnect (::XSCRT::XML::Element< ACE_TCHAR > const&); Interconnect (Interconnect const& s); @@ -1059,198 +1061,162 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void node_pre (Type &o) { - this->node_pre (const_cast <Type const &> (o)); } - virtual void node_pre (Type const&); virtual void node_next (Type &o) { - this->node_next (const_cast <Type const &> (o)); } - virtual void node_next (Type const&); virtual void node_post (Type &o) { - this->node_post (const_cast <Type const &> (o)); } - virtual void node_post (Type const&); virtual void interconnect_pre (Type &o) { - this->interconnect_pre (const_cast <Type const &> (o)); } - virtual void interconnect_pre (Type const&); virtual void interconnect_next (Type &o) { - this->interconnect_next (const_cast <Type const &> (o)); } - virtual void interconnect_next (Type const&); virtual void interconnect_post (Type &o) { - this->interconnect_post (const_cast <Type const &> (o)); } - virtual void interconnect_post (Type const&); virtual void bridge_pre (Type &o) { - this->bridge_pre (const_cast <Type const &> (o)); } - virtual void bridge_pre (Type const&); virtual void bridge_next (Type &o) { - this->bridge_next (const_cast <Type const &> (o)); } - virtual void bridge_next (Type const&); virtual void bridge_post (Type &o) { - this->bridge_post (const_cast <Type const &> (o)); } - virtual void bridge_post (Type const&); virtual void sharedResource_pre (Type &o) { - this->sharedResource_pre (const_cast <Type const &> (o)); } - virtual void sharedResource_pre (Type const&); virtual void sharedResource_next (Type &o) { - this->sharedResource_next (const_cast <Type const &> (o)); } - virtual void sharedResource_next (Type const&); virtual void sharedResource_post (Type &o) { - this->sharedResource_post (const_cast <Type const &> (o)); } - virtual void sharedResource_post (Type const&); virtual void infoProperty_pre (Type &o) { - this->infoProperty_pre (const_cast <Type const &> (o)); } - virtual void infoProperty_pre (Type const&); virtual void infoProperty_next (Type &o) { - this->infoProperty_next (const_cast <Type const &> (o)); } - virtual void infoProperty_next (Type const&); virtual void infoProperty_post (Type &o) { - this->infoProperty_post (const_cast <Type const &> (o)); } - virtual void infoProperty_post (Type const&); @@ -1267,99 +1233,81 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void connect_pre (Type &o) { - this->connect_pre (const_cast <Type const &> (o)); } - virtual void connect_pre (Type const&); virtual void connect_next (Type &o) { - this->connect_next (const_cast <Type const &> (o)); } - virtual void connect_next (Type const&); virtual void connect_post (Type &o) { - this->connect_post (const_cast <Type const &> (o)); } - virtual void connect_post (Type const&); virtual void resource_pre (Type &o) { - this->resource_pre (const_cast <Type const &> (o)); } - virtual void resource_pre (Type const&); virtual void resource_next (Type &o) { - this->resource_next (const_cast <Type const &> (o)); } - virtual void resource_next (Type const&); virtual void resource_post (Type &o) { - this->resource_post (const_cast <Type const &> (o)); } - virtual void resource_post (Type const&); @@ -1376,132 +1324,108 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void connection_pre (Type &o) { - this->connection_pre (const_cast <Type const &> (o)); } - virtual void connection_pre (Type const&); virtual void connection_next (Type &o) { - this->connection_next (const_cast <Type const &> (o)); } - virtual void connection_next (Type const&); virtual void connection_post (Type &o) { - this->connection_post (const_cast <Type const &> (o)); } - virtual void connection_post (Type const&); virtual void connect_pre (Type &o) { - this->connect_pre (const_cast <Type const &> (o)); } - virtual void connect_pre (Type const&); virtual void connect_next (Type &o) { - this->connect_next (const_cast <Type const &> (o)); } - virtual void connect_next (Type const&); virtual void connect_post (Type &o) { - this->connect_post (const_cast <Type const &> (o)); } - virtual void connect_post (Type const&); virtual void resource_pre (Type &o) { - this->resource_pre (const_cast <Type const &> (o)); } - virtual void resource_pre (Type const&); virtual void resource_next (Type &o) { - this->resource_next (const_cast <Type const &> (o)); } - virtual void resource_next (Type const&); virtual void resource_post (Type &o) { - this->resource_post (const_cast <Type const &> (o)); } - virtual void resource_post (Type const&); @@ -1518,132 +1442,108 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void connection_pre (Type &o) { - this->connection_pre (const_cast <Type const &> (o)); } - virtual void connection_pre (Type const&); virtual void connection_next (Type &o) { - this->connection_next (const_cast <Type const &> (o)); } - virtual void connection_next (Type const&); virtual void connection_post (Type &o) { - this->connection_post (const_cast <Type const &> (o)); } - virtual void connection_post (Type const&); virtual void sharedResource_pre (Type &o) { - this->sharedResource_pre (const_cast <Type const &> (o)); } - virtual void sharedResource_pre (Type const&); virtual void sharedResource_next (Type &o) { - this->sharedResource_next (const_cast <Type const &> (o)); } - virtual void sharedResource_next (Type const&); virtual void sharedResource_post (Type &o) { - this->sharedResource_post (const_cast <Type const &> (o)); } - virtual void sharedResource_post (Type const&); virtual void resource_pre (Type &o) { - this->resource_pre (const_cast <Type const &> (o)); } - virtual void resource_pre (Type const&); virtual void resource_next (Type &o) { - this->resource_next (const_cast <Type const &> (o)); } - virtual void resource_next (Type const&); virtual void resource_post (Type &o) { - this->resource_post (const_cast <Type const &> (o)); } - virtual void resource_post (Type const&); @@ -1660,55 +1560,45 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void resourceType (Type &o) { - this->resourceType (const_cast <Type const &> (o)); } - virtual void resourceType (Type const&); virtual void node (Type &o) { - this->node (const_cast <Type const &> (o)); } - virtual void node (Type const&); virtual void property (Type &o) { - this->property (const_cast <Type const &> (o)); } - virtual void property (Type const&); diff --git a/CIAO/tools/Config_Handlers/cdp.cpp b/CIAO/tools/Config_Handlers/cdp.cpp index 7200d3e3a74..96275ee921d 100644 --- a/CIAO/tools/Config_Handlers/cdp.cpp +++ b/CIAO/tools/Config_Handlers/cdp.cpp @@ -33,92 +33,57 @@ namespace CIAO } deploymentPlan:: - deploymentPlan (::CIAO::Config_Handlers::deploymentPlan const& s) + deploymentPlan (deploymentPlan const& s) : ::XSCRT::Type (), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0), realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0), + implementation_ (s.implementation_), + instance_ (s.instance_), + connection_ (s.connection_), + dependsOn_ (s.dependsOn_), + artifact_ (s.artifact_), + infoProperty_ (s.infoProperty_), + localityConstraint_ (s.localityConstraint_), regulator__ () { if (label_.get ()) label_->container (this); if (UUID_.get ()) UUID_->container (this); if (realizes_.get ()) realizes_->container (this); - { - for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i); - } - - { - for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i); - } - - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } - - { - for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i); - } - - { - for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i); - } - - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } - - { - for (localityConstraint_const_iterator i (s.localityConstraint_.begin ());i != s.localityConstraint_.end ();++i) add_localityConstraint (*i); - } } - ::CIAO::Config_Handlers::deploymentPlan& deploymentPlan:: - operator= (::CIAO::Config_Handlers::deploymentPlan const& s) + deploymentPlan& deploymentPlan:: + operator= (deploymentPlan const& s) { - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - if (s.realizes_.get ()) realizes (*(s.realizes_)); - else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0); + if (s.realizes_.get ()) + realizes (*(s.realizes_)); + else + realizes_.reset (0); - implementation_.clear (); - { - for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i); - } + implementation_ = s.implementation_; - instance_.clear (); - { - for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i); - } + instance_ = s.instance_; - connection_.clear (); - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } + connection_ = s.connection_; - dependsOn_.clear (); - { - for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i); - } + dependsOn_ = s.dependsOn_; - artifact_.clear (); - { - for (artifact_const_iterator i (s.artifact_.begin ());i != s.artifact_.end ();++i) add_artifact (*i); - } + artifact_ = s.artifact_; - infoProperty_.clear (); - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } + infoProperty_ = s.infoProperty_; - localityConstraint_.clear (); - { - for (localityConstraint_const_iterator i (s.localityConstraint_.begin ());i != s.localityConstraint_.end ();++i) add_localityConstraint (*i); - } + localityConstraint_ = s.localityConstraint_; return *this; } @@ -587,7 +552,7 @@ namespace CIAO { deploymentPlanTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (deploymentPlan)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::deploymentPlan)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -731,7 +696,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation()); + ::CIAO::Config_Handlers::deploymentPlan::implementation_iterator b (o.begin_implementation()), e (o.end_implementation()); if (b != e) { @@ -753,7 +718,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation()); + ::CIAO::Config_Handlers::deploymentPlan::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation()); if (b != e) { @@ -815,7 +780,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::instance_iterator b (o.begin_instance()), e (o.end_instance()); + ::CIAO::Config_Handlers::deploymentPlan::instance_iterator b (o.begin_instance()), e (o.end_instance()); if (b != e) { @@ -837,7 +802,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance()); + ::CIAO::Config_Handlers::deploymentPlan::instance_const_iterator b (o.begin_instance()), e (o.end_instance()); if (b != e) { @@ -899,7 +864,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::connection_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::deploymentPlan::connection_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -921,7 +886,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::deploymentPlan::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -983,7 +948,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); + ::CIAO::Config_Handlers::deploymentPlan::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); if (b != e) { @@ -1005,7 +970,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); + ::CIAO::Config_Handlers::deploymentPlan::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); if (b != e) { @@ -1067,7 +1032,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::artifact_iterator b (o.begin_artifact()), e (o.end_artifact()); + ::CIAO::Config_Handlers::deploymentPlan::artifact_iterator b (o.begin_artifact()), e (o.end_artifact()); if (b != e) { @@ -1089,7 +1054,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact()); + ::CIAO::Config_Handlers::deploymentPlan::artifact_const_iterator b (o.begin_artifact()), e (o.end_artifact()); if (b != e) { @@ -1151,7 +1116,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::deploymentPlan::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -1173,7 +1138,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::deploymentPlan::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -1235,7 +1200,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::localityConstraint_iterator b (o.begin_localityConstraint()), e (o.end_localityConstraint()); + ::CIAO::Config_Handlers::deploymentPlan::localityConstraint_iterator b (o.begin_localityConstraint()), e (o.end_localityConstraint()); if (b != e) { @@ -1257,7 +1222,7 @@ namespace CIAO { // VC6 anathema strikes again // - deploymentPlan::Type::localityConstraint_const_iterator b (o.begin_localityConstraint()), e (o.end_localityConstraint()); + ::CIAO::Config_Handlers::deploymentPlan::localityConstraint_const_iterator b (o.begin_localityConstraint()), e (o.end_localityConstraint()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/cdp.hpp b/CIAO/tools/Config_Handlers/cdp.hpp index 4e734efe6fb..92e1f678676 100644 --- a/CIAO/tools/Config_Handlers/cdp.hpp +++ b/CIAO/tools/Config_Handlers/cdp.hpp @@ -495,275 +495,225 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void realizes (Type &o) { - this->realizes (const_cast <Type const &> (o)); } - virtual void realizes (Type const&); virtual void implementation_pre (Type &o) { - this->implementation_pre (const_cast <Type const &> (o)); } - virtual void implementation_pre (Type const&); virtual void implementation_next (Type &o) { - this->implementation_next (const_cast <Type const &> (o)); } - virtual void implementation_next (Type const&); virtual void implementation_post (Type &o) { - this->implementation_post (const_cast <Type const &> (o)); } - virtual void implementation_post (Type const&); virtual void instance_pre (Type &o) { - this->instance_pre (const_cast <Type const &> (o)); } - virtual void instance_pre (Type const&); virtual void instance_next (Type &o) { - this->instance_next (const_cast <Type const &> (o)); } - virtual void instance_next (Type const&); virtual void instance_post (Type &o) { - this->instance_post (const_cast <Type const &> (o)); } - virtual void instance_post (Type const&); virtual void connection_pre (Type &o) { - this->connection_pre (const_cast <Type const &> (o)); } - virtual void connection_pre (Type const&); virtual void connection_next (Type &o) { - this->connection_next (const_cast <Type const &> (o)); } - virtual void connection_next (Type const&); virtual void connection_post (Type &o) { - this->connection_post (const_cast <Type const &> (o)); } - virtual void connection_post (Type const&); virtual void dependsOn_pre (Type &o) { - this->dependsOn_pre (const_cast <Type const &> (o)); } - virtual void dependsOn_pre (Type const&); virtual void dependsOn_next (Type &o) { - this->dependsOn_next (const_cast <Type const &> (o)); } - virtual void dependsOn_next (Type const&); virtual void dependsOn_post (Type &o) { - this->dependsOn_post (const_cast <Type const &> (o)); } - virtual void dependsOn_post (Type const&); virtual void artifact_pre (Type &o) { - this->artifact_pre (const_cast <Type const &> (o)); } - virtual void artifact_pre (Type const&); virtual void artifact_next (Type &o) { - this->artifact_next (const_cast <Type const &> (o)); } - virtual void artifact_next (Type const&); virtual void artifact_post (Type &o) { - this->artifact_post (const_cast <Type const &> (o)); } - virtual void artifact_post (Type const&); virtual void infoProperty_pre (Type &o) { - this->infoProperty_pre (const_cast <Type const &> (o)); } - virtual void infoProperty_pre (Type const&); virtual void infoProperty_next (Type &o) { - this->infoProperty_next (const_cast <Type const &> (o)); } - virtual void infoProperty_next (Type const&); virtual void infoProperty_post (Type &o) { - this->infoProperty_post (const_cast <Type const &> (o)); } - virtual void infoProperty_post (Type const&); virtual void localityConstraint_pre (Type &o) { - this->localityConstraint_pre (const_cast <Type const &> (o)); } - virtual void localityConstraint_pre (Type const&); virtual void localityConstraint_next (Type &o) { - this->localityConstraint_next (const_cast <Type const &> (o)); } - virtual void localityConstraint_next (Type const&); virtual void localityConstraint_post (Type &o) { - this->localityConstraint_post (const_cast <Type const &> (o)); } - virtual void localityConstraint_post (Type const&); diff --git a/CIAO/tools/Config_Handlers/cid.cpp b/CIAO/tools/Config_Handlers/cid.cpp index ff69d6d8473..ae4d0cae71f 100644 --- a/CIAO/tools/Config_Handlers/cid.cpp +++ b/CIAO/tools/Config_Handlers/cid.cpp @@ -35,7 +35,7 @@ namespace CIAO } ComponentPackageReference:: - ComponentPackageReference (::CIAO::Config_Handlers::ComponentPackageReference const& s) + ComponentPackageReference (ComponentPackageReference const& s) : ::XSCRT::Type (), requiredUUID_ (s.requiredUUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.requiredUUID_) : 0), @@ -48,16 +48,20 @@ namespace CIAO requiredType_->container (this); } - ::CIAO::Config_Handlers::ComponentPackageReference& ComponentPackageReference:: - operator= (::CIAO::Config_Handlers::ComponentPackageReference const& s) + ComponentPackageReference& ComponentPackageReference:: + operator= (ComponentPackageReference const& s) { - if (s.requiredUUID_.get ()) requiredUUID (*(s.requiredUUID_)); - else requiredUUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.requiredUUID_.get ()) + requiredUUID (*(s.requiredUUID_)); + else + requiredUUID_.reset (0); - if (s.requiredName_.get ()) requiredName (*(s.requiredName_)); - else requiredName_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.requiredName_.get ()) + requiredName (*(s.requiredName_)); + else + requiredName_.reset (0); - requiredType (s.requiredType ()); + requiredType (*s.requiredType_); return *this; } @@ -142,7 +146,6 @@ namespace CIAO SubcomponentInstantiationDescription:: SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), regulator__ () { @@ -150,12 +153,14 @@ namespace CIAO } SubcomponentInstantiationDescription:: - SubcomponentInstantiationDescription (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s) + SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), basePackage_ (s.basePackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageDescription (*s.basePackage_) : 0), specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0), + selectRequirement_ (s.selectRequirement_), + configProperty_ (s.configProperty_), referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0), importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0), id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0), @@ -164,45 +169,39 @@ namespace CIAO name_->container (this); if (basePackage_.get ()) basePackage_->container (this); if (specializedConfig_.get ()) specializedConfig_->container (this); - { - for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i); - } - - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } - if (referencedPackage_.get ()) referencedPackage_->container (this); if (importedPackage_.get ()) importedPackage_->container (this); if (id_.get ()) id_->container (this); } - ::CIAO::Config_Handlers::SubcomponentInstantiationDescription& SubcomponentInstantiationDescription:: - operator= (::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& s) + SubcomponentInstantiationDescription& SubcomponentInstantiationDescription:: + operator= (SubcomponentInstantiationDescription const& s) { - name (s.name ()); + name (*s.name_); - if (s.basePackage_.get ()) basePackage (*(s.basePackage_)); - else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0); + if (s.basePackage_.get ()) + basePackage (*(s.basePackage_)); + else + basePackage_.reset (0); - if (s.specializedConfig_.get ()) specializedConfig (*(s.specializedConfig_)); - else specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (0); + if (s.specializedConfig_.get ()) + specializedConfig (*(s.specializedConfig_)); + else + specializedConfig_.reset (0); - selectRequirement_.clear (); - { - for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i); - } + selectRequirement_ = s.selectRequirement_; - configProperty_.clear (); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } + configProperty_ = s.configProperty_; - if (s.referencedPackage_.get ()) referencedPackage (*(s.referencedPackage_)); - else referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0); + if (s.referencedPackage_.get ()) + referencedPackage (*(s.referencedPackage_)); + else + referencedPackage_.reset (0); - if (s.importedPackage_.get ()) importedPackage (*(s.importedPackage_)); - else importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (0); + if (s.importedPackage_.get ()) + importedPackage (*(s.importedPackage_)); + else + importedPackage_.reset (0); if (s.id_.get ()) id (*(s.id_)); else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0); @@ -460,7 +459,6 @@ namespace CIAO SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__, ::CIAO::Config_Handlers::IdRef const& instance__) : - ::XSCRT::Type (), propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)), instance_ (new ::CIAO::Config_Handlers::IdRef (instance__)), regulator__ () @@ -470,7 +468,7 @@ namespace CIAO } SubcomponentPropertyReference:: - SubcomponentPropertyReference (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s) + SubcomponentPropertyReference (SubcomponentPropertyReference const& s) : ::XSCRT::Type (), propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.propertyName_)), @@ -481,12 +479,12 @@ namespace CIAO instance_->container (this); } - ::CIAO::Config_Handlers::SubcomponentPropertyReference& SubcomponentPropertyReference:: - operator= (::CIAO::Config_Handlers::SubcomponentPropertyReference const& s) + SubcomponentPropertyReference& SubcomponentPropertyReference:: + operator= (SubcomponentPropertyReference const& s) { - propertyName (s.propertyName ()); + propertyName (*s.propertyName_); - instance (s.instance ()); + instance (*s.instance_); return *this; } @@ -528,7 +526,6 @@ namespace CIAO AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__, ::XMLSchema::string< ACE_TCHAR > const& externalName__) : - ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)), externalName_ (new ::XMLSchema::string< ACE_TCHAR > (externalName__)), regulator__ () @@ -538,31 +535,26 @@ namespace CIAO } AssemblyPropertyMapping:: - AssemblyPropertyMapping (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s) + AssemblyPropertyMapping (AssemblyPropertyMapping const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), externalName_ (new ::XMLSchema::string< ACE_TCHAR > (*s.externalName_)), + delegatesTo_ (s.delegatesTo_), regulator__ () { name_->container (this); externalName_->container (this); - { - for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i); - } } - ::CIAO::Config_Handlers::AssemblyPropertyMapping& AssemblyPropertyMapping:: - operator= (::CIAO::Config_Handlers::AssemblyPropertyMapping const& s) + AssemblyPropertyMapping& AssemblyPropertyMapping:: + operator= (AssemblyPropertyMapping const& s) { - name (s.name ()); + name (*s.name_); - externalName (s.externalName ()); + externalName (*s.externalName_); - delegatesTo_.clear (); - { - for (delegatesTo_const_iterator i (s.delegatesTo_.begin ());i != s.delegatesTo_.end ();++i) add_delegatesTo (*i); - } + delegatesTo_ = s.delegatesTo_; return *this; } @@ -641,47 +633,29 @@ namespace CIAO ComponentAssemblyDescription:: ComponentAssemblyDescription () : - ::XSCRT::Type (), regulator__ () { } ComponentAssemblyDescription:: - ComponentAssemblyDescription (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s) + ComponentAssemblyDescription (ComponentAssemblyDescription const& s) : ::XSCRT::Type (), + instance_ (s.instance_), + connection_ (s.connection_), + externalProperty_ (s.externalProperty_), regulator__ () { - { - for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i); - } - - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } - - { - for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i); - } } - ::CIAO::Config_Handlers::ComponentAssemblyDescription& ComponentAssemblyDescription:: - operator= (::CIAO::Config_Handlers::ComponentAssemblyDescription const& s) + ComponentAssemblyDescription& ComponentAssemblyDescription:: + operator= (ComponentAssemblyDescription const& s) { - instance_.clear (); - { - for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i); - } + instance_ = s.instance_; - connection_.clear (); - { - for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i); - } + connection_ = s.connection_; - externalProperty_.clear (); - { - for (externalProperty_const_iterator i (s.externalProperty_.begin ());i != s.externalProperty_.end ();++i) add_externalProperty (*i); - } + externalProperty_ = s.externalProperty_; return *this; } @@ -808,56 +782,32 @@ namespace CIAO MonolithicImplementationDescription:: MonolithicImplementationDescription () : - ::XSCRT::Type (), regulator__ () { } MonolithicImplementationDescription:: - MonolithicImplementationDescription (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s) + MonolithicImplementationDescription (MonolithicImplementationDescription const& s) : ::XSCRT::Type (), + nodeExecParameter_ (s.nodeExecParameter_), + componentExecParameter_ (s.componentExecParameter_), + deployRequirement_ (s.deployRequirement_), + primaryArtifact_ (s.primaryArtifact_), regulator__ () { - { - for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i); - } - - { - for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i); - } - - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } - - { - for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i); - } } - ::CIAO::Config_Handlers::MonolithicImplementationDescription& MonolithicImplementationDescription:: - operator= (::CIAO::Config_Handlers::MonolithicImplementationDescription const& s) + MonolithicImplementationDescription& MonolithicImplementationDescription:: + operator= (MonolithicImplementationDescription const& s) { - nodeExecParameter_.clear (); - { - for (nodeExecParameter_const_iterator i (s.nodeExecParameter_.begin ());i != s.nodeExecParameter_.end ();++i) add_nodeExecParameter (*i); - } + nodeExecParameter_ = s.nodeExecParameter_; - componentExecParameter_.clear (); - { - for (componentExecParameter_const_iterator i (s.componentExecParameter_.begin ());i != s.componentExecParameter_.end ();++i) add_componentExecParameter (*i); - } + componentExecParameter_ = s.componentExecParameter_; - deployRequirement_.clear (); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } + deployRequirement_ = s.deployRequirement_; - primaryArtifact_.clear (); - { - for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i); - } + primaryArtifact_ = s.primaryArtifact_; return *this; } @@ -1022,13 +972,12 @@ namespace CIAO ComponentImplementationDescription:: ComponentImplementationDescription () : - ::XSCRT::Type (), regulator__ () { } ComponentImplementationDescription:: - ComponentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const& s) + ComponentImplementationDescription (ComponentImplementationDescription const& s) : ::XSCRT::Type (), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), @@ -1036,6 +985,10 @@ namespace CIAO implements_ (s.implements_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.implements_) : 0), assemblyImpl_ (s.assemblyImpl_.get () ? new ::CIAO::Config_Handlers::ComponentAssemblyDescription (*s.assemblyImpl_) : 0), monolithicImpl_ (s.monolithicImpl_.get () ? new ::CIAO::Config_Handlers::MonolithicImplementationDescription (*s.monolithicImpl_) : 0), + configProperty_ (s.configProperty_), + capability_ (s.capability_), + dependsOn_ (s.dependsOn_), + infoProperty_ (s.infoProperty_), contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0), href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0), regulator__ () @@ -1045,66 +998,50 @@ namespace CIAO if (implements_.get ()) implements_->container (this); if (assemblyImpl_.get ()) assemblyImpl_->container (this); if (monolithicImpl_.get ()) monolithicImpl_->container (this); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } - - { - for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i); - } - - { - for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i); - } - - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } - if (contentLocation_.get ()) contentLocation_->container (this); if (href_.get ()) href_->container (this); } - ::CIAO::Config_Handlers::ComponentImplementationDescription& ComponentImplementationDescription:: - operator= (::CIAO::Config_Handlers::ComponentImplementationDescription const& s) + ComponentImplementationDescription& ComponentImplementationDescription:: + operator= (ComponentImplementationDescription const& s) { - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - if (s.implements_.get ()) implements (*(s.implements_)); - else implements_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0); + if (s.implements_.get ()) + implements (*(s.implements_)); + else + implements_.reset (0); - if (s.assemblyImpl_.get ()) assemblyImpl (*(s.assemblyImpl_)); - else assemblyImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentAssemblyDescription > (0); + if (s.assemblyImpl_.get ()) + assemblyImpl (*(s.assemblyImpl_)); + else + assemblyImpl_.reset (0); - if (s.monolithicImpl_.get ()) monolithicImpl (*(s.monolithicImpl_)); - else monolithicImpl_ = ::std::auto_ptr< ::CIAO::Config_Handlers::MonolithicImplementationDescription > (0); + if (s.monolithicImpl_.get ()) + monolithicImpl (*(s.monolithicImpl_)); + else + monolithicImpl_.reset (0); - configProperty_.clear (); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } + configProperty_ = s.configProperty_; - capability_.clear (); - { - for (capability_const_iterator i (s.capability_.begin ());i != s.capability_.end ();++i) add_capability (*i); - } + capability_ = s.capability_; - dependsOn_.clear (); - { - for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i); - } + dependsOn_ = s.dependsOn_; - infoProperty_.clear (); - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } + infoProperty_ = s.infoProperty_; - if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_)); - else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.contentLocation_.get ()) + contentLocation (*(s.contentLocation_)); + else + contentLocation_.reset (0); if (s.href_.get ()) href (*(s.href_)); else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); @@ -1872,7 +1809,7 @@ namespace CIAO { ComponentPackageReferenceTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentPackageReference)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentPackageReference)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1886,7 +1823,7 @@ namespace CIAO { SubcomponentInstantiationDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (SubcomponentInstantiationDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::SubcomponentInstantiationDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1900,7 +1837,7 @@ namespace CIAO { SubcomponentPropertyReferenceTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (SubcomponentPropertyReference)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::SubcomponentPropertyReference)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1914,7 +1851,7 @@ namespace CIAO { AssemblyPropertyMappingTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (AssemblyPropertyMapping)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::AssemblyPropertyMapping)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1928,7 +1865,7 @@ namespace CIAO { ComponentAssemblyDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentAssemblyDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentAssemblyDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1942,7 +1879,7 @@ namespace CIAO { MonolithicImplementationDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (MonolithicImplementationDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::MonolithicImplementationDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -1956,7 +1893,7 @@ namespace CIAO { ComponentImplementationDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentImplementationDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentImplementationDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -2194,7 +2131,7 @@ namespace CIAO { // VC6 anathema strikes again // - SubcomponentInstantiationDescription::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); + ::CIAO::Config_Handlers::SubcomponentInstantiationDescription::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); if (b != e) { @@ -2216,7 +2153,7 @@ namespace CIAO { // VC6 anathema strikes again // - SubcomponentInstantiationDescription::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); + ::CIAO::Config_Handlers::SubcomponentInstantiationDescription::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); if (b != e) { @@ -2278,7 +2215,7 @@ namespace CIAO { // VC6 anathema strikes again // - SubcomponentInstantiationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::SubcomponentInstantiationDescription::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -2300,7 +2237,7 @@ namespace CIAO { // VC6 anathema strikes again // - SubcomponentInstantiationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::SubcomponentInstantiationDescription::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -2562,7 +2499,7 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyPropertyMapping::Type::delegatesTo_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo()); + ::CIAO::Config_Handlers::AssemblyPropertyMapping::delegatesTo_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo()); if (b != e) { @@ -2575,6 +2512,8 @@ namespace CIAO delegatesTo_post (o); } + + else delegatesTo_none (o); } void AssemblyPropertyMapping:: @@ -2582,7 +2521,7 @@ namespace CIAO { // VC6 anathema strikes again // - AssemblyPropertyMapping::Type::delegatesTo_const_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo()); + ::CIAO::Config_Handlers::AssemblyPropertyMapping::delegatesTo_const_iterator b (o.begin_delegatesTo()), e (o.end_delegatesTo()); if (b != e) { @@ -2595,6 +2534,8 @@ namespace CIAO delegatesTo_post (o); } + + else delegatesTo_none (o); } void AssemblyPropertyMapping:: @@ -2628,6 +2569,16 @@ namespace CIAO } void AssemblyPropertyMapping:: + delegatesTo_none (Type&) + { + } + + void AssemblyPropertyMapping:: + delegatesTo_none (Type const&) + { + } + + void AssemblyPropertyMapping:: post (Type&) { } @@ -2676,7 +2627,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentAssemblyDescription::Type::instance_iterator b (o.begin_instance()), e (o.end_instance()); + ::CIAO::Config_Handlers::ComponentAssemblyDescription::instance_iterator b (o.begin_instance()), e (o.end_instance()); if (b != e) { @@ -2689,6 +2640,8 @@ namespace CIAO instance_post (o); } + + else instance_none (o); } void ComponentAssemblyDescription:: @@ -2696,7 +2649,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentAssemblyDescription::Type::instance_const_iterator b (o.begin_instance()), e (o.end_instance()); + ::CIAO::Config_Handlers::ComponentAssemblyDescription::instance_const_iterator b (o.begin_instance()), e (o.end_instance()); if (b != e) { @@ -2709,6 +2662,8 @@ namespace CIAO instance_post (o); } + + else instance_none (o); } void ComponentAssemblyDescription:: @@ -2742,11 +2697,21 @@ namespace CIAO } void ComponentAssemblyDescription:: + instance_none (Type&) + { + } + + void ComponentAssemblyDescription:: + instance_none (Type const&) + { + } + + void ComponentAssemblyDescription:: connection (Type& o) { // VC6 anathema strikes again // - ComponentAssemblyDescription::Type::connection_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::ComponentAssemblyDescription::connection_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -2768,7 +2733,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentAssemblyDescription::Type::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); + ::CIAO::Config_Handlers::ComponentAssemblyDescription::connection_const_iterator b (o.begin_connection()), e (o.end_connection()); if (b != e) { @@ -2830,7 +2795,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentAssemblyDescription::Type::externalProperty_iterator b (o.begin_externalProperty()), e (o.end_externalProperty()); + ::CIAO::Config_Handlers::ComponentAssemblyDescription::externalProperty_iterator b (o.begin_externalProperty()), e (o.end_externalProperty()); if (b != e) { @@ -2852,7 +2817,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentAssemblyDescription::Type::externalProperty_const_iterator b (o.begin_externalProperty()), e (o.end_externalProperty()); + ::CIAO::Config_Handlers::ComponentAssemblyDescription::externalProperty_const_iterator b (o.begin_externalProperty()), e (o.end_externalProperty()); if (b != e) { @@ -2960,7 +2925,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::nodeExecParameter_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::nodeExecParameter_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter()); if (b != e) { @@ -2982,7 +2947,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::nodeExecParameter_const_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::nodeExecParameter_const_iterator b (o.begin_nodeExecParameter()), e (o.end_nodeExecParameter()); if (b != e) { @@ -3044,7 +3009,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::componentExecParameter_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::componentExecParameter_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter()); if (b != e) { @@ -3066,7 +3031,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::componentExecParameter_const_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::componentExecParameter_const_iterator b (o.begin_componentExecParameter()), e (o.end_componentExecParameter()); if (b != e) { @@ -3128,7 +3093,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { @@ -3150,7 +3115,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { @@ -3212,7 +3177,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::primaryArtifact_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact()); if (b != e) { @@ -3225,6 +3190,8 @@ namespace CIAO primaryArtifact_post (o); } + + else primaryArtifact_none (o); } void MonolithicImplementationDescription:: @@ -3232,7 +3199,7 @@ namespace CIAO { // VC6 anathema strikes again // - MonolithicImplementationDescription::Type::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact()); + ::CIAO::Config_Handlers::MonolithicImplementationDescription::primaryArtifact_const_iterator b (o.begin_primaryArtifact()), e (o.end_primaryArtifact()); if (b != e) { @@ -3245,6 +3212,8 @@ namespace CIAO primaryArtifact_post (o); } + + else primaryArtifact_none (o); } void MonolithicImplementationDescription:: @@ -3278,6 +3247,16 @@ namespace CIAO } void MonolithicImplementationDescription:: + primaryArtifact_none (Type&) + { + } + + void MonolithicImplementationDescription:: + primaryArtifact_none (Type const&) + { + } + + void MonolithicImplementationDescription:: post (Type&) { } @@ -3466,7 +3445,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -3488,7 +3467,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -3550,7 +3529,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::capability_iterator b (o.begin_capability()), e (o.end_capability()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::capability_iterator b (o.begin_capability()), e (o.end_capability()); if (b != e) { @@ -3572,7 +3551,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::capability_const_iterator b (o.begin_capability()), e (o.end_capability()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::capability_const_iterator b (o.begin_capability()), e (o.end_capability()); if (b != e) { @@ -3634,7 +3613,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); if (b != e) { @@ -3656,7 +3635,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); if (b != e) { @@ -3718,7 +3697,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -3740,7 +3719,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentImplementationDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ComponentImplementationDescription::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/cid.hpp b/CIAO/tools/Config_Handlers/cid.hpp index 5e02b1729ed..473f201abaa 100644 --- a/CIAO/tools/Config_Handlers/cid.hpp +++ b/CIAO/tools/Config_Handlers/cid.hpp @@ -883,6 +883,12 @@ namespace CIAO delegatesTo_post (Type const&); virtual void + delegatesTo_none (Type&); + + virtual void + delegatesTo_none (Type const&); + + virtual void post (Type&); virtual void @@ -928,6 +934,12 @@ namespace CIAO instance_post (Type const&); virtual void + instance_none (Type&); + + virtual void + instance_none (Type const&); + + virtual void connection (Type&); virtual void @@ -1123,6 +1135,12 @@ namespace CIAO primaryArtifact_post (Type const&); virtual void + primaryArtifact_none (Type&); + + virtual void + primaryArtifact_none (Type const&); + + virtual void post (Type&); virtual void @@ -1374,44 +1392,36 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void requiredUUID (Type &o) { - this->requiredUUID (const_cast <Type const &> (o)); } - virtual void requiredUUID (Type const&); virtual void requiredName (Type &o) { - this->requiredName (const_cast <Type const &> (o)); } - virtual void requiredName (Type const&); virtual void requiredType (Type &o) { - this->requiredType (const_cast <Type const &> (o)); } - virtual void requiredType (Type const&); @@ -1428,143 +1438,117 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void basePackage (Type &o) { - this->basePackage (const_cast <Type const &> (o)); } - virtual void basePackage (Type const&); virtual void specializedConfig (Type &o) { - this->specializedConfig (const_cast <Type const &> (o)); } - virtual void specializedConfig (Type const&); virtual void selectRequirement_pre (Type &o) { - this->selectRequirement_pre (const_cast <Type const &> (o)); } - virtual void selectRequirement_pre (Type const&); virtual void selectRequirement_next (Type &o) { - this->selectRequirement_next (const_cast <Type const &> (o)); } - virtual void selectRequirement_next (Type const&); virtual void selectRequirement_post (Type &o) { - this->selectRequirement_post (const_cast <Type const &> (o)); } - virtual void selectRequirement_post (Type const&); virtual void configProperty_pre (Type &o) { - this->configProperty_pre (const_cast <Type const &> (o)); } - virtual void configProperty_pre (Type const&); virtual void configProperty_next (Type &o) { - this->configProperty_next (const_cast <Type const &> (o)); } - virtual void configProperty_next (Type const&); virtual void configProperty_post (Type &o) { - this->configProperty_post (const_cast <Type const &> (o)); } - virtual void configProperty_post (Type const&); virtual void referencedPackage (Type &o) { - this->referencedPackage (const_cast <Type const &> (o)); } - virtual void referencedPackage (Type const&); virtual void importedPackage (Type &o) { - this->importedPackage (const_cast <Type const &> (o)); } - virtual void importedPackage (Type const&); virtual void id (Type &o) { - this->id (const_cast <Type const &> (o)); } - virtual void id (Type const&); @@ -1581,33 +1565,27 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void propertyName (Type &o) { - this->propertyName (const_cast <Type const &> (o)); } - virtual void propertyName (Type const&); virtual void instance (Type &o) { - this->instance (const_cast <Type const &> (o)); } - virtual void instance (Type const&); @@ -1624,66 +1602,54 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void externalName (Type &o) { - this->externalName (const_cast <Type const &> (o)); } - virtual void externalName (Type const&); virtual void delegatesTo_pre (Type &o) { - this->delegatesTo_pre (const_cast <Type const &> (o)); } - virtual void delegatesTo_pre (Type const&); virtual void delegatesTo_next (Type &o) { - this->delegatesTo_next (const_cast <Type const &> (o)); } - virtual void delegatesTo_next (Type const&); virtual void delegatesTo_post (Type &o) { - this->delegatesTo_post (const_cast <Type const &> (o)); } - virtual void delegatesTo_post (Type const&); @@ -1700,110 +1666,90 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void instance_pre (Type &o) { - this->instance_pre (const_cast <Type const &> (o)); } - virtual void instance_pre (Type const&); virtual void instance_next (Type &o) { - this->instance_next (const_cast <Type const &> (o)); } - virtual void instance_next (Type const&); virtual void instance_post (Type &o) { - this->instance_post (const_cast <Type const &> (o)); } - virtual void instance_post (Type const&); virtual void connection_pre (Type &o) { - this->connection_pre (const_cast <Type const &> (o)); } - virtual void connection_pre (Type const&); virtual void connection_next (Type &o) { - this->connection_next (const_cast <Type const &> (o)); } - virtual void connection_next (Type const&); virtual void connection_post (Type &o) { - this->connection_post (const_cast <Type const &> (o)); } - virtual void connection_post (Type const&); virtual void externalProperty_pre (Type &o) { - this->externalProperty_pre (const_cast <Type const &> (o)); } - virtual void externalProperty_pre (Type const&); virtual void externalProperty_next (Type &o) { - this->externalProperty_next (const_cast <Type const &> (o)); } - virtual void externalProperty_next (Type const&); virtual void externalProperty_post (Type &o) { - this->externalProperty_post (const_cast <Type const &> (o)); } - virtual void externalProperty_post (Type const&); @@ -1820,143 +1766,117 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void nodeExecParameter_pre (Type &o) { - this->nodeExecParameter_pre (const_cast <Type const &> (o)); } - virtual void nodeExecParameter_pre (Type const&); virtual void nodeExecParameter_next (Type &o) { - this->nodeExecParameter_next (const_cast <Type const &> (o)); } - virtual void nodeExecParameter_next (Type const&); virtual void nodeExecParameter_post (Type &o) { - this->nodeExecParameter_post (const_cast <Type const &> (o)); } - virtual void nodeExecParameter_post (Type const&); virtual void componentExecParameter_pre (Type &o) { - this->componentExecParameter_pre (const_cast <Type const &> (o)); } - virtual void componentExecParameter_pre (Type const&); virtual void componentExecParameter_next (Type &o) { - this->componentExecParameter_next (const_cast <Type const &> (o)); } - virtual void componentExecParameter_next (Type const&); virtual void componentExecParameter_post (Type &o) { - this->componentExecParameter_post (const_cast <Type const &> (o)); } - virtual void componentExecParameter_post (Type const&); virtual void deployRequirement_pre (Type &o) { - this->deployRequirement_pre (const_cast <Type const &> (o)); } - virtual void deployRequirement_pre (Type const&); virtual void deployRequirement_next (Type &o) { - this->deployRequirement_next (const_cast <Type const &> (o)); } - virtual void deployRequirement_next (Type const&); virtual void deployRequirement_post (Type &o) { - this->deployRequirement_post (const_cast <Type const &> (o)); } - virtual void deployRequirement_post (Type const&); virtual void primaryArtifact_pre (Type &o) { - this->primaryArtifact_pre (const_cast <Type const &> (o)); } - virtual void primaryArtifact_pre (Type const&); virtual void primaryArtifact_next (Type &o) { - this->primaryArtifact_next (const_cast <Type const &> (o)); } - virtual void primaryArtifact_next (Type const&); virtual void primaryArtifact_post (Type &o) { - this->primaryArtifact_post (const_cast <Type const &> (o)); } - virtual void primaryArtifact_post (Type const&); @@ -1973,220 +1893,180 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void implements (Type &o) { - this->implements (const_cast <Type const &> (o)); } - virtual void implements (Type const&); virtual void assemblyImpl (Type &o) { - this->assemblyImpl (const_cast <Type const &> (o)); } - virtual void assemblyImpl (Type const&); virtual void monolithicImpl (Type &o) { - this->monolithicImpl (const_cast <Type const &> (o)); } - virtual void monolithicImpl (Type const&); virtual void configProperty_pre (Type &o) { - this->configProperty_pre (const_cast <Type const &> (o)); } - virtual void configProperty_pre (Type const&); virtual void configProperty_next (Type &o) { - this->configProperty_next (const_cast <Type const &> (o)); } - virtual void configProperty_next (Type const&); virtual void configProperty_post (Type &o) { - this->configProperty_post (const_cast <Type const &> (o)); } - virtual void configProperty_post (Type const&); virtual void capability_pre (Type &o) { - this->capability_pre (const_cast <Type const &> (o)); } - virtual void capability_pre (Type const&); virtual void capability_next (Type &o) { - this->capability_next (const_cast <Type const &> (o)); } - virtual void capability_next (Type const&); virtual void capability_post (Type &o) { - this->capability_post (const_cast <Type const &> (o)); } - virtual void capability_post (Type const&); virtual void dependsOn_pre (Type &o) { - this->dependsOn_pre (const_cast <Type const &> (o)); } - virtual void dependsOn_pre (Type const&); virtual void dependsOn_next (Type &o) { - this->dependsOn_next (const_cast <Type const &> (o)); } - virtual void dependsOn_next (Type const&); virtual void dependsOn_post (Type &o) { - this->dependsOn_post (const_cast <Type const &> (o)); } - virtual void dependsOn_post (Type const&); virtual void infoProperty_pre (Type &o) { - this->infoProperty_pre (const_cast <Type const &> (o)); } - virtual void infoProperty_pre (Type const&); virtual void infoProperty_next (Type &o) { - this->infoProperty_next (const_cast <Type const &> (o)); } - virtual void infoProperty_next (Type const&); virtual void infoProperty_post (Type &o) { - this->infoProperty_post (const_cast <Type const &> (o)); } - virtual void infoProperty_post (Type const&); virtual void contentLocation (Type &o) { - this->contentLocation (const_cast <Type const &> (o)); } - virtual void contentLocation (Type const&); virtual void href (Type &o) { - this->href (const_cast <Type const &> (o)); } - virtual void href (Type const&); diff --git a/CIAO/tools/Config_Handlers/cpd.cpp b/CIAO/tools/Config_Handlers/cpd.cpp index c59e5e18fef..e86fb8b44c5 100644 --- a/CIAO/tools/Config_Handlers/cpd.cpp +++ b/CIAO/tools/Config_Handlers/cpd.cpp @@ -38,7 +38,7 @@ namespace CIAO } PackagedComponentImplementation:: - PackagedComponentImplementation (::CIAO::Config_Handlers::PackagedComponentImplementation const& s) + PackagedComponentImplementation (PackagedComponentImplementation const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -49,12 +49,12 @@ namespace CIAO referencedImplementation_->container (this); } - ::CIAO::Config_Handlers::PackagedComponentImplementation& PackagedComponentImplementation:: - operator= (::CIAO::Config_Handlers::PackagedComponentImplementation const& s) + PackagedComponentImplementation& PackagedComponentImplementation:: + operator= (PackagedComponentImplementation const& s) { - name (s.name ()); + name (*s.name_); - referencedImplementation (s.referencedImplementation ()); + referencedImplementation (*s.referencedImplementation_); return *this; } @@ -95,18 +95,20 @@ namespace CIAO ComponentPackageDescription:: ComponentPackageDescription () : - ::XSCRT::Type (), regulator__ () { } ComponentPackageDescription:: - ComponentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const& s) + ComponentPackageDescription (ComponentPackageDescription const& s) : ::XSCRT::Type (), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0), realizes_ (s.realizes_.get () ? new ::CIAO::Config_Handlers::ComponentInterfaceDescription (*s.realizes_) : 0), + configProperty_ (s.configProperty_), + implementation_ (s.implementation_), + infoProperty_ (s.infoProperty_), contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0), href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0), regulator__ () @@ -114,51 +116,38 @@ namespace CIAO if (label_.get ()) label_->container (this); if (UUID_.get ()) UUID_->container (this); if (realizes_.get ()) realizes_->container (this); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } - - { - for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i); - } - - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } - if (contentLocation_.get ()) contentLocation_->container (this); if (href_.get ()) href_->container (this); } - ::CIAO::Config_Handlers::ComponentPackageDescription& ComponentPackageDescription:: - operator= (::CIAO::Config_Handlers::ComponentPackageDescription const& s) + ComponentPackageDescription& ComponentPackageDescription:: + operator= (ComponentPackageDescription const& s) { - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - if (s.realizes_.get ()) realizes (*(s.realizes_)); - else realizes_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > (0); + if (s.realizes_.get ()) + realizes (*(s.realizes_)); + else + realizes_.reset (0); - configProperty_.clear (); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } + configProperty_ = s.configProperty_; - implementation_.clear (); - { - for (implementation_const_iterator i (s.implementation_.begin ());i != s.implementation_.end ();++i) add_implementation (*i); - } + implementation_ = s.implementation_; - infoProperty_.clear (); - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } + infoProperty_ = s.infoProperty_; - if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_)); - else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.contentLocation_.get ()) + contentLocation (*(s.contentLocation_)); + else + contentLocation_.reset (0); if (s.href_.get ()) href (*(s.href_)); else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); @@ -572,7 +561,7 @@ namespace CIAO { PackagedComponentImplementationTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (PackagedComponentImplementation)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::PackagedComponentImplementation)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -586,7 +575,7 @@ namespace CIAO { ComponentPackageDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentPackageDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentPackageDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -796,7 +785,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageDescription::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::ComponentPackageDescription::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -818,7 +807,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageDescription::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::ComponentPackageDescription::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -880,7 +869,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageDescription::Type::implementation_iterator b (o.begin_implementation()), e (o.end_implementation()); + ::CIAO::Config_Handlers::ComponentPackageDescription::implementation_iterator b (o.begin_implementation()), e (o.end_implementation()); if (b != e) { @@ -902,7 +891,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageDescription::Type::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation()); + ::CIAO::Config_Handlers::ComponentPackageDescription::implementation_const_iterator b (o.begin_implementation()), e (o.end_implementation()); if (b != e) { @@ -964,7 +953,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ComponentPackageDescription::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -986,7 +975,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ComponentPackageDescription::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/cpd.hpp b/CIAO/tools/Config_Handlers/cpd.hpp index 301c15ec126..79a4e61e046 100644 --- a/CIAO/tools/Config_Handlers/cpd.hpp +++ b/CIAO/tools/Config_Handlers/cpd.hpp @@ -431,33 +431,27 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void referencedImplementation (Type &o) { - this->referencedImplementation (const_cast <Type const &> (o)); } - virtual void referencedImplementation (Type const&); @@ -474,165 +468,135 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void realizes (Type &o) { - this->realizes (const_cast <Type const &> (o)); } - virtual void realizes (Type const&); virtual void configProperty_pre (Type &o) { - this->configProperty_pre (const_cast <Type const &> (o)); } - virtual void configProperty_pre (Type const&); virtual void configProperty_next (Type &o) { - this->configProperty_next (const_cast <Type const &> (o)); } - virtual void configProperty_next (Type const&); virtual void configProperty_post (Type &o) { - this->configProperty_post (const_cast <Type const &> (o)); } - virtual void configProperty_post (Type const&); virtual void implementation_pre (Type &o) { - this->implementation_pre (const_cast <Type const &> (o)); } - virtual void implementation_pre (Type const&); virtual void implementation_next (Type &o) { - this->implementation_next (const_cast <Type const &> (o)); } - virtual void implementation_next (Type const&); virtual void implementation_post (Type &o) { - this->implementation_post (const_cast <Type const &> (o)); } - virtual void implementation_post (Type const&); virtual void infoProperty_pre (Type &o) { - this->infoProperty_pre (const_cast <Type const &> (o)); } - virtual void infoProperty_pre (Type const&); virtual void infoProperty_next (Type &o) { - this->infoProperty_next (const_cast <Type const &> (o)); } - virtual void infoProperty_next (Type const&); virtual void infoProperty_post (Type &o) { - this->infoProperty_post (const_cast <Type const &> (o)); } - virtual void infoProperty_post (Type const&); virtual void contentLocation (Type &o) { - this->contentLocation (const_cast <Type const &> (o)); } - virtual void contentLocation (Type const&); virtual void href (Type &o) { - this->href (const_cast <Type const &> (o)); } - virtual void href (Type const&); diff --git a/CIAO/tools/Config_Handlers/iad.cpp b/CIAO/tools/Config_Handlers/iad.cpp index e05cc1272b1..49448050933 100644 --- a/CIAO/tools/Config_Handlers/iad.cpp +++ b/CIAO/tools/Config_Handlers/iad.cpp @@ -38,7 +38,7 @@ namespace CIAO } NamedImplementationArtifact:: - NamedImplementationArtifact (::CIAO::Config_Handlers::NamedImplementationArtifact const& s) + NamedImplementationArtifact (NamedImplementationArtifact const& s) : ::XSCRT::Type (), name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)), @@ -49,12 +49,12 @@ namespace CIAO referencedArtifact_->container (this); } - ::CIAO::Config_Handlers::NamedImplementationArtifact& NamedImplementationArtifact:: - operator= (::CIAO::Config_Handlers::NamedImplementationArtifact const& s) + NamedImplementationArtifact& NamedImplementationArtifact:: + operator= (NamedImplementationArtifact const& s) { - name (s.name ()); + name (*s.name_); - referencedArtifact (s.referencedArtifact ()); + referencedArtifact (*s.referencedArtifact_); return *this; } @@ -95,83 +95,58 @@ namespace CIAO ImplementationArtifactDescription:: ImplementationArtifactDescription () : - ::XSCRT::Type (), regulator__ () { } ImplementationArtifactDescription:: - ImplementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s) + ImplementationArtifactDescription (ImplementationArtifactDescription const& s) : ::XSCRT::Type (), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), UUID_ (s.UUID_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.UUID_) : 0), + location_ (s.location_), + dependsOn_ (s.dependsOn_), + execParameter_ (s.execParameter_), + infoProperty_ (s.infoProperty_), + deployRequirement_ (s.deployRequirement_), contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0), href_ (s.href_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.href_) : 0), regulator__ () { if (label_.get ()) label_->container (this); if (UUID_.get ()) UUID_->container (this); - { - for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i); - } - - { - for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i); - } - - { - for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i); - } - - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } - - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } - if (contentLocation_.get ()) contentLocation_->container (this); if (href_.get ()) href_->container (this); } - ::CIAO::Config_Handlers::ImplementationArtifactDescription& ImplementationArtifactDescription:: - operator= (::CIAO::Config_Handlers::ImplementationArtifactDescription const& s) + ImplementationArtifactDescription& ImplementationArtifactDescription:: + operator= (ImplementationArtifactDescription const& s) { - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - location_.clear (); - { - for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i); - } + location_ = s.location_; - dependsOn_.clear (); - { - for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i); - } + dependsOn_ = s.dependsOn_; - execParameter_.clear (); - { - for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i); - } + execParameter_ = s.execParameter_; - infoProperty_.clear (); - { - for (infoProperty_const_iterator i (s.infoProperty_.begin ());i != s.infoProperty_.end ();++i) add_infoProperty (*i); - } + infoProperty_ = s.infoProperty_; - deployRequirement_.clear (); - { - for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i); - } + deployRequirement_ = s.deployRequirement_; - if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_)); - else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.contentLocation_.get ()) + contentLocation (*(s.contentLocation_)); + else + contentLocation_.reset (0); if (s.href_.get ()) href (*(s.href_)); else href_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); @@ -638,7 +613,7 @@ namespace CIAO { NamedImplementationArtifactTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (NamedImplementationArtifact)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::NamedImplementationArtifact)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -652,7 +627,7 @@ namespace CIAO { ImplementationArtifactDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ImplementationArtifactDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ImplementationArtifactDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -840,7 +815,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::location_iterator b (o.begin_location()), e (o.end_location()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::location_iterator b (o.begin_location()), e (o.end_location()); if (b != e) { @@ -862,7 +837,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::location_const_iterator b (o.begin_location()), e (o.end_location()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::location_const_iterator b (o.begin_location()), e (o.end_location()); if (b != e) { @@ -924,7 +899,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::dependsOn_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); if (b != e) { @@ -946,7 +921,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::dependsOn_const_iterator b (o.begin_dependsOn()), e (o.end_dependsOn()); if (b != e) { @@ -1008,7 +983,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::execParameter_iterator b (o.begin_execParameter()), e (o.end_execParameter()); if (b != e) { @@ -1030,7 +1005,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::execParameter_const_iterator b (o.begin_execParameter()), e (o.end_execParameter()); if (b != e) { @@ -1092,7 +1067,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::infoProperty_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -1114,7 +1089,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::infoProperty_const_iterator b (o.begin_infoProperty()), e (o.end_infoProperty()); if (b != e) { @@ -1176,7 +1151,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::deployRequirement_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { @@ -1198,7 +1173,7 @@ namespace CIAO { // VC6 anathema strikes again // - ImplementationArtifactDescription::Type::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); + ::CIAO::Config_Handlers::ImplementationArtifactDescription::deployRequirement_const_iterator b (o.begin_deployRequirement()), e (o.end_deployRequirement()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/iad.hpp b/CIAO/tools/Config_Handlers/iad.hpp index 85366d71951..9964ff4d1fb 100644 --- a/CIAO/tools/Config_Handlers/iad.hpp +++ b/CIAO/tools/Config_Handlers/iad.hpp @@ -499,33 +499,27 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void name (Type &o) { - this->name (const_cast <Type const &> (o)); } - virtual void name (Type const&); virtual void referencedArtifact (Type &o) { - this->referencedArtifact (const_cast <Type const &> (o)); } - virtual void referencedArtifact (Type const&); @@ -542,220 +536,180 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void location_pre (Type &o) { - this->location_pre (const_cast <Type const &> (o)); } - virtual void location_pre (Type const&); virtual void location_next (Type &o) { - this->location_next (const_cast <Type const &> (o)); } - virtual void location_next (Type const&); virtual void location_post (Type &o) { - this->location_post (const_cast <Type const &> (o)); } - virtual void location_post (Type const&); virtual void dependsOn_pre (Type &o) { - this->dependsOn_pre (const_cast <Type const &> (o)); } - virtual void dependsOn_pre (Type const&); virtual void dependsOn_next (Type &o) { - this->dependsOn_next (const_cast <Type const &> (o)); } - virtual void dependsOn_next (Type const&); virtual void dependsOn_post (Type &o) { - this->dependsOn_post (const_cast <Type const &> (o)); } - virtual void dependsOn_post (Type const&); virtual void execParameter_pre (Type &o) { - this->execParameter_pre (const_cast <Type const &> (o)); } - virtual void execParameter_pre (Type const&); virtual void execParameter_next (Type &o) { - this->execParameter_next (const_cast <Type const &> (o)); } - virtual void execParameter_next (Type const&); virtual void execParameter_post (Type &o) { - this->execParameter_post (const_cast <Type const &> (o)); } - virtual void execParameter_post (Type const&); virtual void infoProperty_pre (Type &o) { - this->infoProperty_pre (const_cast <Type const &> (o)); } - virtual void infoProperty_pre (Type const&); virtual void infoProperty_next (Type &o) { - this->infoProperty_next (const_cast <Type const &> (o)); } - virtual void infoProperty_next (Type const&); virtual void infoProperty_post (Type &o) { - this->infoProperty_post (const_cast <Type const &> (o)); } - virtual void infoProperty_post (Type const&); virtual void deployRequirement_pre (Type &o) { - this->deployRequirement_pre (const_cast <Type const &> (o)); } - virtual void deployRequirement_pre (Type const&); virtual void deployRequirement_next (Type &o) { - this->deployRequirement_next (const_cast <Type const &> (o)); } - virtual void deployRequirement_next (Type const&); virtual void deployRequirement_post (Type &o) { - this->deployRequirement_post (const_cast <Type const &> (o)); } - virtual void deployRequirement_post (Type const&); virtual void contentLocation (Type &o) { - this->contentLocation (const_cast <Type const &> (o)); } - virtual void contentLocation (Type const&); virtual void href (Type &o) { - this->href (const_cast <Type const &> (o)); } - virtual void href (Type const&); diff --git a/CIAO/tools/Config_Handlers/pcd.cpp b/CIAO/tools/Config_Handlers/pcd.cpp index b74723f1265..eca1b948b7f 100644 --- a/CIAO/tools/Config_Handlers/pcd.cpp +++ b/CIAO/tools/Config_Handlers/pcd.cpp @@ -33,23 +33,18 @@ namespace CIAO } ComponentPackageImport:: - ComponentPackageImport (::CIAO::Config_Handlers::ComponentPackageImport const& s) + ComponentPackageImport (ComponentPackageImport const& s) : ::XSCRT::Type (), + location_ (s.location_), regulator__ () { - { - for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i); - } } - ::CIAO::Config_Handlers::ComponentPackageImport& ComponentPackageImport:: - operator= (::CIAO::Config_Handlers::ComponentPackageImport const& s) + ComponentPackageImport& ComponentPackageImport:: + operator= (ComponentPackageImport const& s) { - location_.clear (); - { - for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i); - } + location_ = s.location_; return *this; } @@ -100,13 +95,12 @@ namespace CIAO PackageConfiguration:: PackageConfiguration () : - ::XSCRT::Type (), regulator__ () { } PackageConfiguration:: - PackageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const& s) + PackageConfiguration (PackageConfiguration const& s) : ::XSCRT::Type (), label_ (s.label_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.label_) : 0), @@ -115,6 +109,8 @@ namespace CIAO specializedConfig_ (s.specializedConfig_.get () ? new ::CIAO::Config_Handlers::PackageConfiguration (*s.specializedConfig_) : 0), importedPackage_ (s.importedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageImport (*s.importedPackage_) : 0), referencedPackage_ (s.referencedPackage_.get () ? new ::CIAO::Config_Handlers::ComponentPackageReference (*s.referencedPackage_) : 0), + selectRequirement_ (s.selectRequirement_), + configProperty_ (s.configProperty_), contentLocation_ (s.contentLocation_.get () ? new ::XMLSchema::string< ACE_TCHAR > (*s.contentLocation_) : 0), regulator__ () { @@ -124,50 +120,50 @@ namespace CIAO if (specializedConfig_.get ()) specializedConfig_->container (this); if (importedPackage_.get ()) importedPackage_->container (this); if (referencedPackage_.get ()) referencedPackage_->container (this); - { - for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i); - } - - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } - if (contentLocation_.get ()) contentLocation_->container (this); } - ::CIAO::Config_Handlers::PackageConfiguration& PackageConfiguration:: - operator= (::CIAO::Config_Handlers::PackageConfiguration const& s) + PackageConfiguration& PackageConfiguration:: + operator= (PackageConfiguration const& s) { - if (s.label_.get ()) label (*(s.label_)); - else label_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.label_.get ()) + label (*(s.label_)); + else + label_.reset (0); - if (s.UUID_.get ()) UUID (*(s.UUID_)); - else UUID_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.UUID_.get ()) + UUID (*(s.UUID_)); + else + UUID_.reset (0); - if (s.basePackage_.get ()) basePackage (*(s.basePackage_)); - else basePackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageDescription > (0); + if (s.basePackage_.get ()) + basePackage (*(s.basePackage_)); + else + basePackage_.reset (0); - if (s.specializedConfig_.get ()) specializedConfig (*(s.specializedConfig_)); - else specializedConfig_ = ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > (0); + if (s.specializedConfig_.get ()) + specializedConfig (*(s.specializedConfig_)); + else + specializedConfig_.reset (0); - if (s.importedPackage_.get ()) importedPackage (*(s.importedPackage_)); - else importedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageImport > (0); + if (s.importedPackage_.get ()) + importedPackage (*(s.importedPackage_)); + else + importedPackage_.reset (0); - if (s.referencedPackage_.get ()) referencedPackage (*(s.referencedPackage_)); - else referencedPackage_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentPackageReference > (0); + if (s.referencedPackage_.get ()) + referencedPackage (*(s.referencedPackage_)); + else + referencedPackage_.reset (0); - selectRequirement_.clear (); - { - for (selectRequirement_const_iterator i (s.selectRequirement_.begin ());i != s.selectRequirement_.end ();++i) add_selectRequirement (*i); - } + selectRequirement_ = s.selectRequirement_; - configProperty_.clear (); - { - for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i); - } + configProperty_ = s.configProperty_; - if (s.contentLocation_.get ()) contentLocation (*(s.contentLocation_)); - else contentLocation_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (0); + if (s.contentLocation_.get ()) + contentLocation (*(s.contentLocation_)); + else + contentLocation_.reset (0); return *this; } @@ -583,7 +579,7 @@ namespace CIAO { ComponentPackageImportTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (ComponentPackageImport)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::ComponentPackageImport)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -597,7 +593,7 @@ namespace CIAO { PackageConfigurationTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (PackageConfiguration)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::PackageConfiguration)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -651,7 +647,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageImport::Type::location_iterator b (o.begin_location()), e (o.end_location()); + ::CIAO::Config_Handlers::ComponentPackageImport::location_iterator b (o.begin_location()), e (o.end_location()); if (b != e) { @@ -664,6 +660,8 @@ namespace CIAO location_post (o); } + + else location_none (o); } void ComponentPackageImport:: @@ -671,7 +669,7 @@ namespace CIAO { // VC6 anathema strikes again // - ComponentPackageImport::Type::location_const_iterator b (o.begin_location()), e (o.end_location()); + ::CIAO::Config_Handlers::ComponentPackageImport::location_const_iterator b (o.begin_location()), e (o.end_location()); if (b != e) { @@ -684,6 +682,8 @@ namespace CIAO location_post (o); } + + else location_none (o); } void ComponentPackageImport:: @@ -717,6 +717,16 @@ namespace CIAO } void ComponentPackageImport:: + location_none (Type&) + { + } + + void ComponentPackageImport:: + location_none (Type const&) + { + } + + void ComponentPackageImport:: post (Type&) { } @@ -923,7 +933,7 @@ namespace CIAO { // VC6 anathema strikes again // - PackageConfiguration::Type::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); + ::CIAO::Config_Handlers::PackageConfiguration::selectRequirement_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); if (b != e) { @@ -945,7 +955,7 @@ namespace CIAO { // VC6 anathema strikes again // - PackageConfiguration::Type::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); + ::CIAO::Config_Handlers::PackageConfiguration::selectRequirement_const_iterator b (o.begin_selectRequirement()), e (o.end_selectRequirement()); if (b != e) { @@ -1007,7 +1017,7 @@ namespace CIAO { // VC6 anathema strikes again // - PackageConfiguration::Type::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::PackageConfiguration::configProperty_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { @@ -1029,7 +1039,7 @@ namespace CIAO { // VC6 anathema strikes again // - PackageConfiguration::Type::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); + ::CIAO::Config_Handlers::PackageConfiguration::configProperty_const_iterator b (o.begin_configProperty()), e (o.end_configProperty()); if (b != e) { diff --git a/CIAO/tools/Config_Handlers/pcd.hpp b/CIAO/tools/Config_Handlers/pcd.hpp index d18119a5fc4..c562a14b737 100644 --- a/CIAO/tools/Config_Handlers/pcd.hpp +++ b/CIAO/tools/Config_Handlers/pcd.hpp @@ -248,6 +248,12 @@ namespace CIAO location_post (Type const&); virtual void + location_none (Type&); + + virtual void + location_none (Type const&); + + virtual void post (Type&); virtual void @@ -439,44 +445,36 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void location_pre (Type &o) { - this->location_pre (const_cast <Type const &> (o)); } - virtual void location_pre (Type const&); virtual void location_next (Type &o) { - this->location_next (const_cast <Type const &> (o)); } - virtual void location_next (Type const&); virtual void location_post (Type &o) { - this->location_post (const_cast <Type const &> (o)); } - virtual void location_post (Type const&); @@ -493,154 +491,126 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void label (Type &o) { - this->label (const_cast <Type const &> (o)); } - virtual void label (Type const&); virtual void UUID (Type &o) { - this->UUID (const_cast <Type const &> (o)); } - virtual void UUID (Type const&); virtual void basePackage (Type &o) { - this->basePackage (const_cast <Type const &> (o)); } - virtual void basePackage (Type const&); virtual void specializedConfig (Type &o) { - this->specializedConfig (const_cast <Type const &> (o)); } - virtual void specializedConfig (Type const&); virtual void importedPackage (Type &o) { - this->importedPackage (const_cast <Type const &> (o)); } - virtual void importedPackage (Type const&); virtual void referencedPackage (Type &o) { - this->referencedPackage (const_cast <Type const &> (o)); } - virtual void referencedPackage (Type const&); virtual void selectRequirement_pre (Type &o) { - this->selectRequirement_pre (const_cast <Type const &> (o)); } - virtual void selectRequirement_pre (Type const&); virtual void selectRequirement_next (Type &o) { - this->selectRequirement_next (const_cast <Type const &> (o)); } - virtual void selectRequirement_next (Type const&); virtual void selectRequirement_post (Type &o) { - this->selectRequirement_post (const_cast <Type const &> (o)); } - virtual void selectRequirement_post (Type const&); virtual void configProperty_pre (Type &o) { - this->configProperty_pre (const_cast <Type const &> (o)); } - virtual void configProperty_pre (Type const&); virtual void configProperty_next (Type &o) { - this->configProperty_next (const_cast <Type const &> (o)); } - virtual void configProperty_next (Type const&); virtual void configProperty_post (Type &o) { - this->configProperty_post (const_cast <Type const &> (o)); } - virtual void configProperty_post (Type const&); virtual void contentLocation (Type &o) { - this->contentLocation (const_cast <Type const &> (o)); } - virtual void contentLocation (Type const&); diff --git a/CIAO/tools/Config_Handlers/toplevel.cpp b/CIAO/tools/Config_Handlers/toplevel.cpp index 4a06443d8fb..07efd4f4007 100644 --- a/CIAO/tools/Config_Handlers/toplevel.cpp +++ b/CIAO/tools/Config_Handlers/toplevel.cpp @@ -33,23 +33,18 @@ namespace CIAO } TopLevelPackageDescription:: - TopLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const& s) + TopLevelPackageDescription (TopLevelPackageDescription const& s) : ::XSCRT::Type (), + basePackage_ (s.basePackage_), regulator__ () { - { - for (basePackage_const_iterator i (s.basePackage_.begin ());i != s.basePackage_.end ();++i) add_basePackage (*i); - } } - ::CIAO::Config_Handlers::TopLevelPackageDescription& TopLevelPackageDescription:: - operator= (::CIAO::Config_Handlers::TopLevelPackageDescription const& s) + TopLevelPackageDescription& TopLevelPackageDescription:: + operator= (TopLevelPackageDescription const& s) { - basePackage_.clear (); - { - for (basePackage_const_iterator i (s.basePackage_.begin ());i != s.basePackage_.end ();++i) add_basePackage (*i); - } + basePackage_ = s.basePackage_; return *this; } @@ -149,7 +144,7 @@ namespace CIAO { TopLevelPackageDescriptionTypeInfoInitializer () { - ::XSCRT::TypeId id (typeid (TopLevelPackageDescription)); + ::XSCRT::TypeId id (typeid (::CIAO::Config_Handlers::TopLevelPackageDescription)); ::XSCRT::ExtendedTypeInfo nf (id); nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type)); @@ -203,7 +198,7 @@ namespace CIAO { // VC6 anathema strikes again // - TopLevelPackageDescription::Type::basePackage_iterator b (o.begin_basePackage()), e (o.end_basePackage()); + ::CIAO::Config_Handlers::TopLevelPackageDescription::basePackage_iterator b (o.begin_basePackage()), e (o.end_basePackage()); if (b != e) { @@ -216,6 +211,8 @@ namespace CIAO basePackage_post (o); } + + else basePackage_none (o); } void TopLevelPackageDescription:: @@ -223,7 +220,7 @@ namespace CIAO { // VC6 anathema strikes again // - TopLevelPackageDescription::Type::basePackage_const_iterator b (o.begin_basePackage()), e (o.end_basePackage()); + ::CIAO::Config_Handlers::TopLevelPackageDescription::basePackage_const_iterator b (o.begin_basePackage()), e (o.end_basePackage()); if (b != e) { @@ -236,6 +233,8 @@ namespace CIAO basePackage_post (o); } + + else basePackage_none (o); } void TopLevelPackageDescription:: @@ -269,6 +268,16 @@ namespace CIAO } void TopLevelPackageDescription:: + basePackage_none (Type&) + { + } + + void TopLevelPackageDescription:: + basePackage_none (Type const&) + { + } + + void TopLevelPackageDescription:: post (Type&) { } diff --git a/CIAO/tools/Config_Handlers/toplevel.hpp b/CIAO/tools/Config_Handlers/toplevel.hpp index 468b927cc59..39a8fa85eb0 100644 --- a/CIAO/tools/Config_Handlers/toplevel.hpp +++ b/CIAO/tools/Config_Handlers/toplevel.hpp @@ -127,6 +127,12 @@ namespace CIAO basePackage_post (Type const&); virtual void + basePackage_none (Type&); + + virtual void + basePackage_none (Type const&); + + virtual void post (Type&); virtual void @@ -153,44 +159,36 @@ namespace CIAO virtual void traverse (Type &o) { - this->traverse (const_cast <Type const &> (o)); } - virtual void traverse (Type const&); virtual void basePackage_pre (Type &o) { - this->basePackage_pre (const_cast <Type const &> (o)); } - virtual void basePackage_pre (Type const&); virtual void basePackage_next (Type &o) { - this->basePackage_next (const_cast <Type const &> (o)); } - virtual void basePackage_next (Type const&); virtual void basePackage_post (Type &o) { - this->basePackage_post (const_cast <Type const &> (o)); } - virtual void basePackage_post (Type const&); |