Added the ACE and TAO for this branchGH5_0port

1 files changed, 5 insertions, 29 deletions

diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 7db39ced0c5..46b004d62ac 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -112,8 +112,7 @@ BE_GlobalData::BE_GlobalData (void)
     gen_client_stub_ (true),
     gen_server_skeleton_ (true),
     gen_local_iface_anyops_ (true),
-    use_clonable_in_args_ (false),
-    gen_template_export_ (false)
+    use_clonable_in_args_ (false)
 {
 }
 
@@ -851,18 +850,6 @@ BE_GlobalData::use_clonable_in_args (void) const
   return this->use_clonable_in_args_;
 }
 
-bool
-BE_GlobalData::gen_template_export (void) const
-{
-  return this->gen_template_export_;
-}
-
-void
-BE_GlobalData::gen_template_export (bool val)
-{
-  this->gen_template_export_ = val;
-}
-
 const char*
 BE_GlobalData::anyop_header_ending (void) const
 {
@@ -1307,8 +1294,6 @@ BE_GlobalData::ccmobject (void)
 
       AST_Decl *d =
         idl_global->scopes ().top_non_null ()->lookup_by_name (&sn,
-                                                               true,
-                                                               true,
                                                                true);
 
       sn.destroy ();
@@ -1988,11 +1973,6 @@ BE_GlobalData::parse_args (long &i, char **av)
                 // Smart proxies.
                 be_global->gen_smart_proxies (true);
               }
-            else if (av[i][3] == 'e')
-              {
-                // Explicit sequence base class template export.
-                be_global->gen_template_export (true);
-              }
             else
               {
                 ACE_ERROR ((
@@ -2637,18 +2617,14 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -GA\t\t\tgenerate Any operator and type codes in *A.{h,cpp}")
-      ACE_TEXT (" (generated in *C.{h,cpp} by default)\n")
+      ACE_TEXT (" -GA\t\t\tgenerate Any operator and type code bodies in *A.cpp")
+      ACE_TEXT (" (generated in *C.cpp by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Guc\t\t\tgenerate uninlined constant if declared ")
-      ACE_TEXT ("in a module (inlined by default)\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Gse\t\t\tgenerate explicit export of sequence's ")
-      ACE_TEXT ("template base class (not generated by default)\n")
+      ACE_TEXT ("in a module")
+      ACE_TEXT (" (inlined by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,