ChangeLogTag: Fri Aug 29 16:31:12 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 33 insertions, 13 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 437356acbb6..f04f03ad371 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,27 @@
+Fri Aug 29 16:31:12 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+
+          Removed the check for non-local interface around the 
+          generation of the declaration of the _is_a() method -
+          this was overlooked in
+
+          Fri Aug 29 15:05:33 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+
+          Added the global :: qualifier before the generated scoped
+          names on the lhs and in the template parameter of the
+          dynamic_cast statement at the end of _unchecked_narrow().
+          MSVC needs this for nested scoped with repeated names.
+
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be_include/be_sequence.h:
+
+          Removed the default arg value in create_name() - it is never
+          used. Also made minor changes to gen_name() to correct its
+          use in the traits visitor when handling sequences of strings.
+
 Fri Aug 29 15:35:05 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/Thread_Lane_Resources.cpp (finalize): Initialize the output
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 4d671068048..10036d51362 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -185,9 +185,8 @@ be_sequence::gen_name (void)
   else
     {
       ACE_OS::sprintf (namebuf,
-                       "_tao_seq_%s_%s",
-                       bt->local_name ()->get_string (),
-                       fn ? fn->local_name ()->get_string () : "");
+                       "_tao_seq_%s_",
+                       bt->flat_name ());
     }
 
   // Append the size (if any).
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 86cfe2de528..323d08dcc0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -213,13 +213,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // The _is_a method
-  if (! node->is_local ())
-    {
-      *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-          << "const char *type_id" << be_nl
-          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl;
-    }
+  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char *type_id" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl;
 
   // The _interface_repository_id method.
   *os << "virtual const char* _interface_repository_id (void) const;";
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 12a006e3878..1a55b4875c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -717,8 +717,8 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node,
     }
 
   *os << "{" << be_idt_nl
-      << node->name () << "_ptr p =" << be_idt_nl
-      << "dynamic_cast<" << node->name () << "_ptr> (obj);" 
+      << "::" << node->name () << "_ptr p =" << be_idt_nl
+      << "dynamic_cast<::" << node->name () << "_ptr> (obj);" 
       << be_uidt_nl << be_nl
       << "p->_add_ref ();" << be_nl << be_nl
       << "return p;" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 6b20c4254e2..c2efe37bb3d 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -63,7 +63,7 @@ public:
                idl_bool abstract);
   // Constructor.
 
-  virtual int create_name (be_typedef *node = 0);
+  virtual int create_name (be_typedef *node);
   // Create a name for ourselves. If we are typedefed, then we get the name of
   // the typedef node, else we generate a name for ourselves.