1 files changed, 26 insertions, 17 deletions

diff --git a/CIAO/tools/Config_Handlers/toplevel.cpp b/CIAO/tools/Config_Handlers/toplevel.cpp
index 4a06443d8fb..45f35831f9f 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;
     }
@@ -82,7 +77,7 @@ namespace CIAO
     }
 
     void TopLevelPackageDescription::
-    add_basePackage (::CIAO::Config_Handlers::PackageConfiguration const& e)
+    add_basePackage (ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::PackageConfiguration, ACE_Null_Mutex >  const& e)
     {
       basePackage_.push_back (e);
     }
@@ -116,7 +111,7 @@ namespace CIAO
 
         if (n == "basePackage")
         {
-          ::CIAO::Config_Handlers::PackageConfiguration t (e);
+          ACE_Refcounted_Auto_Ptr < ::CIAO::Config_Handlers::PackageConfiguration, ACE_Null_Mutex >  t (new ::CIAO::Config_Handlers::PackageConfiguration (e));
           add_basePackage (t);
         }
 
@@ -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,19 +198,21 @@ 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)
         {
           basePackage_pre (o);
           for (; b != e;)
           {
-            dispatch (*b);
+            dispatch (*(*b));
             if (++b != e) basePackage_next (o);
           }
 
           basePackage_post (o);
         }
+
+        else basePackage_none (o);
       }
 
       void TopLevelPackageDescription::
@@ -223,19 +220,21 @@ 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)
         {
           basePackage_pre (o);
           for (; b != e;)
           {
-            dispatch (*b);
+            dispatch (*(*b));
             if (++b != e) basePackage_next (o);
           }
 
           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&)
       {
       }