1 files changed, 113 insertions, 29 deletions

diff --git a/config_complex_types_1/Config_Handlers/Basic_Deployment_Data.cpp b/config_complex_types_1/Config_Handlers/Basic_Deployment_Data.cpp
index a70e3ad6b38..27682fe0351 100644
--- a/config_complex_types_1/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/config_complex_types_1/Config_Handlers/Basic_Deployment_Data.cpp
@@ -3090,7 +3090,6 @@ namespace CIAO
     node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
     source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
     implementation_ (new ::XMLSchema::IDREF< ACE_TCHAR > (*s.implementation_)),
-    deployedResource_ (s.deployedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedResource_) : 0),
     deployedSharedResource_ (s.deployedSharedResource_.get () ? new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (*s.deployedSharedResource_) : 0),
     id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
     regulator__ ()
@@ -3103,7 +3102,10 @@ namespace CIAO
         for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
       }
 
-      if (deployedResource_.get ()) deployedResource_->container (this);
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
+
       if (deployedSharedResource_.get ()) deployedSharedResource_->container (this);
       if (id_.get ()) id_->container (this);
     }
@@ -3124,8 +3126,10 @@ namespace CIAO
         for (configProperty_const_iterator i (s.configProperty_.begin ());i != s.configProperty_.end ();++i) add_configProperty (*i);
       }
 
-      if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
-      else deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
+      deployedResource_.clear ();
+      {
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+      }
 
       if (s.deployedSharedResource_.get ()) deployedSharedResource (*(s.deployedSharedResource_));
       else deployedSharedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (0);
@@ -3233,31 +3237,40 @@ namespace CIAO
 
     // InstanceDeploymentDescription
     // 
-    bool InstanceDeploymentDescription::
-    deployedResource_p () const
+    InstanceDeploymentDescription::deployedResource_iterator InstanceDeploymentDescription::
+    begin_deployedResource ()
     {
-      return deployedResource_.get () != 0;
+      return deployedResource_.begin ();
     }
 
-    ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& InstanceDeploymentDescription::
-    deployedResource () const
+    InstanceDeploymentDescription::deployedResource_iterator InstanceDeploymentDescription::
+    end_deployedResource ()
     {
-      return *deployedResource_;
+      return deployedResource_.end ();
+    }
+
+    InstanceDeploymentDescription::deployedResource_const_iterator InstanceDeploymentDescription::
+    begin_deployedResource () const
+    {
+      return deployedResource_.begin ();
+    }
+
+    InstanceDeploymentDescription::deployedResource_const_iterator InstanceDeploymentDescription::
+    end_deployedResource () const
+    {
+      return deployedResource_.end ();
     }
 
     void InstanceDeploymentDescription::
-    deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+    add_deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
     {
-      if (deployedResource_.get ())
-      {
-        *deployedResource_ = e;
-      }
+      deployedResource_.push_back (e);
+    }
 
-      else
-      {
-        deployedResource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > (new ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription (e));
-        deployedResource_->container (this);
-      }
+    size_t InstanceDeploymentDescription::
+    count_deployedResource(void) const
+    {
+      return deployedResource_.size ();
     }
 
     // InstanceDeploymentDescription
@@ -6270,7 +6283,7 @@ namespace CIAO
         else if (n == "deployedResource")
         {
           ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription t (e);
-          deployedResource (t);
+          add_deployedResource (t);
         }
 
         else if (n == "deployedSharedResource")
@@ -11426,8 +11439,7 @@ namespace CIAO
         source (o);
         implementation (o);
         configProperty (o);
-        if (o.deployedResource_p ()) deployedResource (o);
-        else deployedResource_none (o);
+        deployedResource (o);
         if (o.deployedSharedResource_p ()) deployedSharedResource (o);
         else deployedSharedResource_none (o);
         if (o.id_p ()) id (o);
@@ -11444,8 +11456,7 @@ namespace CIAO
         source (o);
         implementation (o);
         configProperty (o);
-        if (o.deployedResource_p ()) deployedResource (o);
-        else deployedResource_none (o);
+        deployedResource (o);
         if (o.deployedSharedResource_p ()) deployedSharedResource (o);
         else deployedSharedResource_none (o);
         if (o.id_p ()) id (o);
@@ -11598,13 +11609,75 @@ namespace CIAO
       void InstanceDeploymentDescription::
       deployedResource (Type& o)
       {
-        dispatch (o.deployedResource ());
+        // VC6 anathema strikes again
+        //
+        InstanceDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
+
+        else deployedResource_none (o);
       }
 
       void InstanceDeploymentDescription::
       deployedResource (Type const& o)
       {
-        dispatch (o.deployedResource ());
+        // VC6 anathema strikes again
+        //
+        InstanceDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
+
+        if (b != e)
+        {
+          deployedResource_pre (o);
+          for (; b != e;)
+          {
+            dispatch (*b);
+            if (++b != e) deployedResource_next (o);
+          }
+
+          deployedResource_post (o);
+        }
+
+        else deployedResource_none (o);
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_pre (Type&)
+      {
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_pre (Type const&)
+      {
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_next (Type&)
+      {
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_next (Type const&)
+      {
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_post (Type&)
+      {
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_post (Type const&)
+      {
       }
 
       void InstanceDeploymentDescription::
@@ -15470,10 +15543,21 @@ namespace CIAO
       }
 
       void InstanceDeploymentDescription::
-      deployedResource (Type const& o)
+      deployedResource_pre (Type const&)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
-        Traversal::InstanceDeploymentDescription::deployedResource (o);
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_next (Type const& o)
+      {
+        deployedResource_post (o);
+        deployedResource_pre (o);
+      }
+
+      void InstanceDeploymentDescription::
+      deployedResource_post (Type const&)
+      {
         pop_ ();
       }