ChangeLogTag:Fri Feb 21 13:07:33 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 39 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 954a81b439c..f04e9cee173 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb 21 13:07:33 2003  Ossama Othman  <ossama@uci.edu>
+
+	* TAO_IDL/be/be_interface.cpp (gen_stub_ctor):
+	* TAO_IDL/be/be_visitor_exception/exception_cs.cpp (visit_exception): 
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp (visit_interface):
+
+	  Generate code that uses the ACE_NESTED_CLASS macro to work
+	  around MSVC++ 6 lack of fully functional C++ namespace sport.
+
 Fri Feb 21 12:54:07 2003  Ossama Othman  <ossama@uci.edu>
 
 	* tao/ValueBase.h (add_ref, remove_ref):
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index d1bb3fea82a..5fa13c7536f 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -36,8 +36,8 @@
 #include "nr_extern.h"
 #include "ace/Process.h"
 
-ACE_RCSID (be, 
-           be_interface, 
+ACE_RCSID (be,
+           be_interface,
            "$Id$")
 
 // Default constructor.
@@ -494,15 +494,15 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
                 << "TAO_Abstract_ServantBase *servant" << be_uidt_nl
                 << ")"
                 << be_nl;
-      *os << ": Object (objref, _tao_collocated, servant)";
+      *os << ": ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant)";
 
       if (this->has_mixed_parentage_)
         {
           *os << be_idt;
 
-          int status = 
+          int status =
             this->traverse_inheritance_graph (
-                      be_interface::gen_abstract_init_helper, 
+                      be_interface::gen_abstract_init_helper,
                       os,
                       I_TRUE
                     );
@@ -847,7 +847,7 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "return val;" << be_uidt_nl;
   *cs << "}" << be_nl << be_nl;
 
-  // Hooks for the flat name global functions used by references to 
+  // Hooks for the flat name global functions used by references to
   // non-defined interfaces.
   *cs << "::" << interface_full_name
       << "_ptr" << be_nl
@@ -1254,7 +1254,7 @@ be_interface::gen_operation_table (const char *flat_name,
         ACE_NEW_RETURN (temp_file,
                         char [ACE_OS::strlen (idl_global->temp_dir ())
                               + ACE_OS::strlen (flat_name)
-                              + ACE_OS::strlen (".gperf") 
+                              + ACE_OS::strlen (".gperf")
                               + 1],
                         -1);
 
@@ -1610,8 +1610,8 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
 
   be_code_emitter_wrapper wrapper (gen);
 
-  return this->traverse_inheritance_graph (wrapper, 
-                                           os, 
+  return this->traverse_inheritance_graph (wrapper,
+                                           os,
                                            abstract_paths_only);
 }
 
@@ -1667,7 +1667,7 @@ be_interface::traverse_inheritance_graph (
       // If we are doing a component, we check for a parent.
       if (bi->node_type () == AST_Decl::NT_component)
         {
-          AST_Component *base = 
+          AST_Component *base =
             AST_Component::narrow_from_decl (bi)->base_component ();
 
           if (base != 0)
@@ -2104,7 +2104,7 @@ be_interface::queryinterface_helper (be_interface *derived,
                                      TAO_OutStream *os)
 {
   // Emit the comparison code.
-  *os << "(type == ACE_reinterpret_cast (" 
+  *os << "(type == ACE_reinterpret_cast ("
       << be_idt << be_idt <<be_idt << be_idt << be_idt << be_idt_nl
       << "ptr_arith_t," << be_nl;
 
@@ -2173,7 +2173,7 @@ be_interface::downcast_helper (be_interface * /* derived */,
       return 0;
     }
 
-  *os << "if (ACE_OS::strcmp (logical_type_id," << be_nl 
+  *os << "if (ACE_OS::strcmp (logical_type_id," << be_nl
       << "                    \""
       << base->repoID () << "\") == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -2432,7 +2432,7 @@ be_interface::in_mult_inheritance_helper (be_interface *derived,
   return 0;
 }
 
-int 
+int
 be_interface::gen_abstract_init_helper (be_interface *node,
                                         be_interface *base,
                                         TAO_OutStream *os)
@@ -2452,7 +2452,7 @@ be_interface::gen_abstract_init_helper (be_interface *node,
       *os << be_nl
           << "ACE_NESTED_CLASS ("
           << parent_decl->name () << ", "
-          << base->local_name () 
+          << base->local_name ()
           << ") (objref, _tao_collocated, servant)";
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index f8a4e3fc6c2..e095d67a2cc 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -20,8 +20,8 @@
 
 #include "be_visitor_typecode/typecode_defn.h"
 
-ACE_RCSID (be_visitor_exception, 
-           exception_cs, 
+ACE_RCSID (be_visitor_exception,
+           exception_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -115,7 +115,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << node->name () << "::operator= (const ::"
       << node->name () << " &_tao_excp)" << be_nl
       << "{" << be_idt_nl
-      << "this->UserException::operator= "
+      << "this->ACE_NESTED_CLASS (CORBA, UserException)::operator= "
       << "(_tao_excp);";
 
   // Assign each individual member.
@@ -132,7 +132,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
                         -1);
     }
 
-  *os << be_nl 
+  *os << be_nl
       << "return *this;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -184,7 +184,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << ");" << be_uidt_nl
       << "return result;" << be_uidt_nl
       << "}" << be_nl << be_nl;
-  
+
   *os << "void " << node->name () << "::_raise (void)" << be_nl
       << "{" << be_idt_nl
       << "TAO_RAISE (*this);" << be_uidt_nl
@@ -296,7 +296,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
                             -1);
         }
 
-      *os << "  : CORBA::UserException (" 
+      *os << "  : CORBA::UserException ("
           << be_idt << be_idt << be_idt << be_idt_nl
           << "\"" << node->repoID () << "\"," << be_nl
           << "\"" << node->local_name () << "\"" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 845450e071c..c28edd70da9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -138,7 +138,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (node->has_mixed_parentage ())
     {
-      *os << be_nl << be_nl 
+      *os << be_nl << be_nl
           << "void" << be_nl
           << "CORBA::release (" << node->name () << "_ptr p)" << be_nl
           << "{" << be_idt_nl
@@ -226,8 +226,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   if (node->is_local ())
     {
-      *os << be_nl << be_nl 
-          << node->name () << "::" << node->local_name () 
+      *os << be_nl << be_nl
+          << node->name () << "::" << node->local_name ()
           << " (void)" << be_nl
           << "{}";
     }
@@ -235,7 +235,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (! node->is_abstract () && ! node->is_local ())
     {
        // Generate the destructor and default constructor.
-      *os << be_nl << be_nl 
+      *os << be_nl << be_nl
           << node->name () << "::" << node->local_name ()
           << " (int collocated)" << be_nl
           << "{" << be_idt_nl
@@ -244,7 +244,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << be_uidt << "}";
 
       // Collocation setup method.
-      *os << be_nl << be_nl 
+      *os << be_nl << be_nl
           << "void" << be_nl
           << node->name () << "::" << node->flat_name ()
           << "_setup_collocation (int collocated)" << be_nl
@@ -316,7 +316,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "void" << be_nl
           << node->name () << "::_add_ref (void)" << be_nl
           << "{" << be_idt_nl
-          << "this->Object::_add_ref ();" << be_uidt_nl
+          << "this->ACE_NESTED_CLASS (CORBA, Object)::_add_ref ();"
+          << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
@@ -496,7 +497,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_cs::"
                              "visit_interface - "
-                             "_is_a method codegen failed\n"), 
+                             "_is_a method codegen failed\n"),
                             -1);
         }
 
@@ -538,7 +539,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
         }
       else
         {
-          *os << "return this->Object::_is_a (" << be_idt << be_idt_nl
+          *os << "return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ("
+              << be_idt << be_idt_nl
               << "value" << be_nl
               << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
               << ");" << be_uidt << be_uidt_nl;