1 files changed, 40 insertions, 16 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/cid.cpp b/TAO/CIAO/tools/Config_Handlers/cid.cpp
index 37c49aabe18..39111605f5d 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.cpp
@@ -20,7 +20,7 @@ namespace CIAO
 
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                          ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
+    ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -230,7 +230,7 @@ namespace CIAO
 
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                   ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
+    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
     : 
     ::XSCRT::Type (), 
     propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
@@ -298,8 +298,8 @@ namespace CIAO
 
     AssemblyPropertyMapping::
     AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-                             ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-                             ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
+    ::XMLSchema::string< ACE_TCHAR > const& externalName__,
+    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -401,11 +401,15 @@ namespace CIAO
     regulator__ ()
     {
       {
-        for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*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 (connection_const_iterator i (s.connection_.begin ());
+        i != s.connection_.end ();
+        ++i) add_connection (*i);
       }
 
       if (externalProperty_.get ()) externalProperty_->container (this);
@@ -416,12 +420,16 @@ namespace CIAO
     {
       instance_.clear ();
       {
-        for (instance_const_iterator i (s.instance_.begin ());i != s.instance_.end ();++i) add_instance (*i);
+        for (instance_const_iterator i (s.instance_.begin ());
+        i != s.instance_.end ();
+        ++i) add_instance (*i);
       }
 
       connection_.clear ();
       {
-        for (connection_const_iterator i (s.connection_.begin ());i != s.connection_.end ();++i) add_connection (*i);
+        for (connection_const_iterator i (s.connection_.begin ());
+        i != s.connection_.end ();
+        ++i) add_connection (*i);
       }
 
       if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
@@ -558,7 +566,9 @@ namespace CIAO
     {
       if (execParameter_.get ()) execParameter_->container (this);
       {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
+        i != s.primaryArtifact_.end ();
+        ++i) add_primaryArtifact (*i);
       }
 
       if (deployRequirement_.get ()) deployRequirement_->container (this);
@@ -572,7 +582,9 @@ namespace CIAO
 
       primaryArtifact_.clear ();
       {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
+        i != s.primaryArtifact_.end ();
+        ++i) add_primaryArtifact (*i);
       }
 
       if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
@@ -1877,7 +1889,9 @@ namespace CIAO
         if (b != e)
         {
           instance_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) instance_next (o);
@@ -1897,7 +1911,9 @@ namespace CIAO
         if (b != e)
         {
           instance_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) instance_next (o);
@@ -1947,7 +1963,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -1967,7 +1985,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -2109,7 +2129,9 @@ namespace CIAO
         if (b != e)
         {
           primaryArtifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) primaryArtifact_next (o);
@@ -2129,7 +2151,9 @@ namespace CIAO
         if (b != e)
         {
           primaryArtifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) primaryArtifact_next (o);