diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/ccd.cpp')
| -rw-r--r-- | CIAO/tools/Config_Handlers/ccd.cpp | 164 |
1 files changed, 68 insertions, 96 deletions
diff --git a/CIAO/tools/Config_Handlers/ccd.cpp b/CIAO/tools/Config_Handlers/ccd.cpp index 64e40b82567..e2dd1d03262 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); @@ -240,7 +212,7 @@ namespace CIAO } void ComponentInterfaceDescription:: - add_supportedType (::XMLSchema::string< ACE_TCHAR > const& e) + add_supportedType (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { supportedType_.push_back (e); } @@ -278,7 +250,7 @@ namespace CIAO } void ComponentInterfaceDescription:: - add_idlFile (::XMLSchema::string< ACE_TCHAR > const& e) + add_idlFile (ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > const& e) { idlFile_.push_back (e); } @@ -316,7 +288,7 @@ namespace CIAO } void ComponentInterfaceDescription:: - add_configProperty (::CIAO::Config_Handlers::Property const& e) + add_configProperty (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { configProperty_.push_back (e); } @@ -354,7 +326,7 @@ namespace CIAO } void ComponentInterfaceDescription:: - add_port (::CIAO::Config_Handlers::ComponentPortDescription const& e) + add_port (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentPortDescription, ACE_Null_Mutex > const& e) { port_.push_back (e); } @@ -392,7 +364,7 @@ namespace CIAO } void ComponentInterfaceDescription:: - add_property (::CIAO::Config_Handlers::ComponentPropertyDescription const& e) + add_property (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentPropertyDescription, ACE_Null_Mutex > const& e) { property_.push_back (e); } @@ -430,7 +402,7 @@ namespace CIAO } void ComponentInterfaceDescription:: - add_infoProperty (::CIAO::Config_Handlers::Property const& e) + add_infoProperty (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > const& e) { infoProperty_.push_back (e); } @@ -546,37 +518,37 @@ namespace CIAO else if (n == "supportedType") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_supportedType (t); } else if (n == "idlFile") { - ::XMLSchema::string< ACE_TCHAR > t (e); + ACE_Refcounted_Auto_Ptr < ::XMLSchema::string< ACE_TCHAR >, ACE_Null_Mutex > t (new ::XMLSchema::string< ACE_TCHAR > (e)); add_idlFile (t); } else if (n == "configProperty") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_configProperty (t); } else if (n == "port") { - ::CIAO::Config_Handlers::ComponentPortDescription t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentPortDescription, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ComponentPortDescription (e)); add_port (t); } else if (n == "property") { - ::CIAO::Config_Handlers::ComponentPropertyDescription t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::ComponentPropertyDescription, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::ComponentPropertyDescription (e)); add_property (t); } else if (n == "infoProperty") { - ::CIAO::Config_Handlers::Property t (e); + ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::Property, ACE_Null_Mutex > t (new ::CIAO::Config_Handlers::Property (e)); add_infoProperty (t); } @@ -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,14 +752,14 @@ 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) { supportedType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) supportedType_next (o); } @@ -802,14 +774,14 @@ 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) { supportedType_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) supportedType_next (o); } @@ -864,14 +836,14 @@ 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) { idlFile_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) idlFile_next (o); } @@ -886,14 +858,14 @@ 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) { idlFile_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) idlFile_next (o); } @@ -948,14 +920,14 @@ 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) { configProperty_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) configProperty_next (o); } @@ -970,14 +942,14 @@ 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) { configProperty_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) configProperty_next (o); } @@ -1032,14 +1004,14 @@ 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) { port_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) port_next (o); } @@ -1054,14 +1026,14 @@ 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) { port_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) port_next (o); } @@ -1116,14 +1088,14 @@ 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) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -1138,14 +1110,14 @@ 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) { property_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) property_next (o); } @@ -1200,14 +1172,14 @@ 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) { infoProperty_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) infoProperty_next (o); } @@ -1222,14 +1194,14 @@ 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) { infoProperty_pre (o); for (; b != e;) { - dispatch (*b); + dispatch (*(*b)); if (++b != e) infoProperty_next (o); } |