diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/cdd.cpp')
| -rw-r--r-- | CIAO/tools/Config_Handlers/cdd.cpp | 277 |
1 files changed, 107 insertions, 170 deletions
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) { |