ChangeLogTag: Wed Aug 24 20:41:59 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 11 insertions, 66 deletions

diff --git a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
index 5447007e71f..6ab0814e449 100644
--- a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -697,12 +697,6 @@ namespace
     post (Type& t)
     {
       os << "protected:" << endl
-/*
-         << "CIAO_GLUE"
-         << regex::perl_s (t.scoped_name ().scope_name ().str (),
-                           "/::/_/")
-         << "::"
-*/
          << t.name () << "_Context *context_;" << endl
          << "};";
     }
diff --git a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index 4a44fec949c..f9975a08afb 100644
--- a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -713,12 +713,6 @@ namespace
          << STRS[EXCP_CE] << "))" << endl
          << "{"
          << "this->context_ =" << endl
-/*
-         << "CIAO_GLUE"
-         << regex::perl_s (t.scoped_name ().scope_name ().str (),
-                           "/::/_/")
-         << "::"
-*/
          << t.name () << "_Context::_narrow (" << endl
          << "ctx" << endl
          << STRS[ENV_ARG] <<");"
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
index 2db62d3c8ea..f14919defdb 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -582,9 +582,6 @@ namespace
          << i.name () << "_Servant_T<int> "
          << i.name () << "_Servant;";
 
-      // Close the CIAO_GLUE namespace.
-//      os << "}";
-
       i.context ().set ("facet_hdr_gen", true);
     }
   };
@@ -1043,9 +1040,6 @@ namespace
     {
       // Component context class closer.
       os << "};";
-
-      // Namespace closer.
-//      os << "}";
     }
 
   private:
@@ -1694,9 +1688,6 @@ namespace
     {
       // Component servant class closer.
       os << "};";
-
-      // Namespace closer.
-//      os << "}";
     }
   };
 
@@ -2216,12 +2207,6 @@ namespace
          << STRS[ENV_HDR] << ");" << endl;
     }
 
-    virtual void post (Type&)
-    {
-      // Namespace closer.
-//      os << "}";
-    }
-
   private:
     CommandLine const& cl_;
     TypeNameEmitter type_name_emitter_;
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index 9905a2b5111..249d51308a2 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -1058,9 +1058,6 @@ namespace
          << STRS[ACE_TR] << " (CORBA::INTERNAL (), 0);" << endl
          << "}" << endl;
 
-      // Close the CIAO_GLUE namespace.
-//      os << "}";
-
       i.context ().set ("facet_src_gen", true);
     }
   };
@@ -1789,13 +1786,6 @@ namespace
          << endl
          << "}";
     }
-
-    virtual void
-    post (Type&)
-    {
-      // Namespace closer.
-//      os << "}";
-    }
   };
 
   struct ServantEmitter : Traversal::Component, EmitterBase
@@ -2351,21 +2341,7 @@ namespace
       virtual void
       traverse (SemanticGraph::Type& t)
       {
-/*
-        os << "CIAO_GLUE";
-
-        ScopedName scope (t.scoped_name ().scope_name ());
-
-        if (!scope.simple ())
-        {
-          for (Name::Iterator i (scope.begin () + 1); i != scope.end (); ++i)
-          {
-            os << "_" << i->str ();
-          }
-        }
-*/
-        os //<< "::" 
-           << t.name () << "_Servant";
+        os << t.name () << "_Servant";
       }
 
     private:
@@ -3757,13 +3733,6 @@ namespace
 
       os << "}";
     }
-
-    virtual void
-    post (Type&)
-    {
-      // Namespace closer.
-//      os << "}";
-    }
   };
 
   struct HomeEmitter : Traversal::Home, EmitterBase
@@ -4304,9 +4273,6 @@ namespace
     virtual void
     post (Type& t)
     {
-      // Namespace closer.
-//      os << "}";
-
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::PortableServer::Servant"
          << endl
@@ -4333,10 +4299,7 @@ namespace
          << "}"
          << "return new" << endl;
 
-      os //<< "CIAO_GLUE"
-         //<< regex::perl_s (t.scoped_name ().scope_name ().str (), "/::/_/")
-         //<< "::" 
-         << t.name () << "_Servant (" << endl
+      os << t.name () << "_Servant (" << endl
          << "x.in ()," << endl
          << "ins_name," << endl
          << "c);" << endl
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 7c372b3de98..b98b9f8c93c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Aug 24 20:41:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * CIDLC/ExecImplHeaderGenerator.cpp:
+        * CIDLC/ExecImplSourceGenerator.cpp:
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+        
+          Removed commented-out code.
+
 Tue Aug 23 20:09:59 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* DAnCE/Old_Config_Handlers/DT_Handler.h: