Modified generation of scoped arguments to include the complete scoped

name for all types needed except interface (checked in yesterday) and
added ACE_GLOBAL_COLONS macro where needed to keep SunCC 5.0 happy.

8 files changed, 175 insertions, 184 deletions

diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 727a37aed6b..e2f64ff3327 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -546,15 +546,15 @@ be_interface::gen_var_impl (char *interface_local_name,
   *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname <<
     " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << "::" << interface_full_name 
+  *ci << "  " << ": ptr_ (" << ACE_GLOBAL_COLONS << interface_full_name 
       << "::_nil ())" << nl;
   *ci << "{}\n\n";
 
   // constr from a _ptr
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << "::" << interface_full_name 
-      << "_ptr p)" << nl;
+  *ci << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_ptr p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{}\n\n";
 
@@ -576,7 +576,7 @@ be_interface::gen_var_impl (char *interface_local_name,
   *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname << " (const " << "::" << interface_full_name 
       << "_var &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (" << "::" << interface_full_name 
+  *ci << "  : ptr_ (" << ACE_GLOBAL_COLONS << interface_full_name 
       << "::_duplicate (p.ptr ()))" << nl;
   *ci << "{}\n\n";
 
@@ -593,8 +593,8 @@ be_interface::gen_var_impl (char *interface_local_name,
   // assignment operator
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << "::" << interface_full_name 
-      << "_ptr p)" << nl;
+  *ci << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_ptr p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "CORBA::release (this->ptr_);" << nl;
@@ -813,8 +813,8 @@ be_interface::gen_out_impl (char *interface_local_name,
       // constr from a _ptr
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" 
-      << "::" << interface_full_name << "_ptr &p)" << nl;
+  *ci << fname << "::" << lname << " ("  << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_ptr &p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -826,8 +826,8 @@ be_interface::gen_out_impl (char *interface_local_name,
   // constructor from _var &
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << "::" << interface_full_name 
-      << "_var &p) // constructor from _var" << nl;
+  *ci << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_var &p) // constructor from _var" << nl;
   *ci << "  : ptr_ (p.out ())" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -842,19 +842,19 @@ be_interface::gen_out_impl (char *interface_local_name,
   *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname << " (const " << "::" << interface_full_name 
       << "_out &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << "::" << interface_full_name 
-      << "_out &, p).ptr_)" << nl;
+  *ci << "  : ptr_ (ACE_const_cast (" << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_out &, p).ptr_)" << nl;
   *ci << "{}\n\n";
 
       // assignment operator from _out &
   ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << nl;
   *ci << fname << "::operator= (const " << "::" << interface_full_name 
       << "_out &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << "::" << interface_full_name 
-      << "_out&, p).ptr_;" << nl;
+  *ci << "this->ptr_ = ACE_const_cast (" << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_out&, p).ptr_;" << nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -875,8 +875,8 @@ be_interface::gen_out_impl (char *interface_local_name,
       // assignment operator from _ptr
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << "::" << interface_full_name 
-      << "_ptr p)" << nl;
+  *ci << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << interface_full_name << "_ptr p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "this->ptr_ = p;" << nl;
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 50d013310cd..99a9f4bd793 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -222,27 +222,28 @@ be_structure::gen_var_impl (char *,
 
   // default constr
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
+  *ci << fname << "::" << lname 
+      << " (void) // default constructor" << nl;
   *ci << "  " << ": ptr_ (0)" << nl;
   *ci << "{}\n\n";
 
   // constr from a pointer
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () << " *p)" << nl;
+  *ci << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << this->name () << " *p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{}\n\n";
 
   // copy constructor
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
+  *ci << fname << "::" << lname << " (const ::" << fname 
+      << " &p) // copy constructor" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "if (p.ptr_)" << nl;
-  *ci << "  ACE_NEW (this->ptr_, " << this->name () 
+  *ci << "  ACE_NEW (this->ptr_, " << "::" << this->name () 
       << " (*p.ptr_));" << nl;
   *ci << "else" << nl;
   *ci << "  this->ptr_ = 0;\n";
@@ -255,10 +256,10 @@ be_structure::gen_var_impl (char *,
       *ci << "// fixed-size types only" << nl;
       *ci << "ACE_INLINE" << nl;
       *ci << fname << "::" << lname << " (const " 
-          << this->name () << " &p)" << nl;
+          << "::" << this->name () << " &p)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << "ACE_NEW (this->ptr_, " << this->name () 
+      *ci << "ACE_NEW (this->ptr_, " << "::" << this->name () 
           << " (p));\n";
       ci->decr_indent ();
       *ci << "}\n\n";
@@ -277,8 +278,8 @@ be_structure::gen_var_impl (char *,
   // assignment operator from a pointer
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
+  *ci << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << this->name () << " *p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "delete this->ptr_;" << nl;
@@ -289,16 +290,16 @@ be_structure::gen_var_impl (char *,
 
   // assignment operator from _var
   ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << fname << "::operator= (const ::" << fname 
+      << " &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "if (this != &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "delete this->ptr_;" << nl;
-  *ci << "ACE_NEW_RETURN (this->ptr_, " << this->name () 
+  *ci << "ACE_NEW_RETURN (this->ptr_, " << "::" << this->name () 
       << " (*p.ptr_), *this);\n";
   ci->decr_indent ();
   *ci << "}" << nl;
@@ -312,7 +313,7 @@ be_structure::gen_var_impl (char *,
       ci->indent ();
       *ci << "// fixed-size types only" << nl;
       *ci << "ACE_INLINE " << fname << " &" << nl;
-      *ci << fname << "::operator= (const " << this->name () 
+      *ci << fname << "::operator= (const " << "::" << this->name () 
           << " &p)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -320,7 +321,7 @@ be_structure::gen_var_impl (char *,
       *ci << "{\n";
       ci->incr_indent ();
       *ci << "delete this->ptr_;" << nl;
-      *ci << "ACE_NEW_RETURN (this->ptr_, " 
+      *ci << "ACE_NEW_RETURN (this->ptr_, ::" 
           << this->name () << " (p), *this);\n";
       ci->decr_indent ();
       *ci << "}" << nl;
@@ -331,7 +332,7 @@ be_structure::gen_var_impl (char *,
 
   // two arrow operators
   ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE const " << "::" << this->name () << " *" << nl;
   *ci << fname << "::operator-> (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -340,7 +341,7 @@ be_structure::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE " << "::" << this->name () << " *" << nl;
   *ci << fname << "::operator-> (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -351,8 +352,8 @@ be_structure::gen_var_impl (char *,
   // other extra methods - 3 cast operator ()
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::operator const " << this->name () <<
-    " &() const // cast" << nl;
+  *ci << fname << "::operator const " << "::" << this->name () 
+      << " &() const // cast" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -361,7 +362,7 @@ be_structure::gen_var_impl (char *,
 
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::operator " << this->name () 
+  *ci << fname << "::operator " << "::" << this->name () 
       << " &() // cast " << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -371,7 +372,7 @@ be_structure::gen_var_impl (char *,
 
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::operator " << this->name () 
+  *ci << fname << "::operator " << "::" << this->name () 
       << " &() const // cast " << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -385,7 +386,7 @@ be_structure::gen_var_impl (char *,
       ci->indent ();
       *ci << "// variable-size types only" << nl;
       *ci << "ACE_INLINE" << nl;
-      *ci << fname << "::operator " << this->name () 
+      *ci << fname << "::operator " << "::" << this->name () 
           << " *&() // cast " << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -396,7 +397,7 @@ be_structure::gen_var_impl (char *,
 
   // in, inout, out, and _retn
   ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " &" << nl;
+  *ci << "ACE_INLINE const " << "::" << this->name () << " &" << nl;
   *ci << fname << "::in (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -405,7 +406,7 @@ be_structure::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " &" << nl;
+  *ci << "ACE_INLINE " << "::" << this->name () << " &" << nl;
   *ci << fname << "::inout (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -418,7 +419,7 @@ be_structure::gen_var_impl (char *,
   if (this->size_type () == be_decl::VARIABLE)
     {
       *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE " << this->name () << " *&" << nl;
+      *ci << "ACE_INLINE " << "::" << this->name () << " *&" << nl;
       *ci << fname << "::out (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -429,11 +430,11 @@ be_structure::gen_var_impl (char *,
       *ci << "}\n\n";
 
       ci->indent ();
-      *ci << "ACE_INLINE " << this->name () << " *" << nl;
+      *ci << "ACE_INLINE " << "::" << this->name () << " *" << nl;
       *ci << fname << "::_retn (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << this->name () << " *tmp = this->ptr_;" << nl;
+      *ci << "::" << this->name () << " *tmp = this->ptr_;" << nl;
       *ci << "this->ptr_ = 0;" << nl;
       *ci << "return tmp;\n";
       ci->decr_indent ();
@@ -443,7 +444,7 @@ be_structure::gen_var_impl (char *,
   else
     {
       *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE " << this->name () << " &" << nl;
+      *ci << "ACE_INLINE " << "::" << this->name () << " &" << nl;
       *ci << fname << "::out (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -452,7 +453,7 @@ be_structure::gen_var_impl (char *,
       *ci << "}\n\n";
 
       ci->indent ();
-      *ci << "ACE_INLINE " << this->name () << nl;
+      *ci << "ACE_INLINE " << "::" << this->name () << nl;
       *ci << fname << "::_retn (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -464,7 +465,7 @@ be_structure::gen_var_impl (char *,
 
   // the additional ptr () member function
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE " << "::" << this->name () << " *" << nl;
   *ci << fname << "::ptr (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -582,7 +583,8 @@ be_structure::gen_out_impl (char *,
   // constr from a pointer
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () << " *&p)" << nl;
+  *ci << fname << "::" << lname << " (" << "::" 
+      << this->name () << " *&p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -593,8 +595,8 @@ be_structure::gen_out_impl (char *,
   // constructor from _var &
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
+  *ci << fname << "::" << lname << " (" << "::" << this->name () 
+      << "_var &p) // constructor from _var" << nl;
   *ci << "  : ptr_ (p.out ())" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -606,19 +608,19 @@ be_structure::gen_out_impl (char *,
   // copy constructor
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << fname << "&,p).ptr_)" << nl;
+  *ci << fname << "::" << lname << " (const ::" << fname 
+      << " &p) // copy constructor" << nl;
+  *ci << "  : ptr_ (ACE_const_cast (::" << fname << "&,p).ptr_)" << nl;
   *ci << "{}\n\n";
 
   // assignment operator from _out &
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
+  *ci << fname << "::operator= (const ::" << fname <<
     " &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
+  *ci << "this->ptr_ = ACE_const_cast (::" << fname << "&, p).ptr_;" << nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -628,8 +630,8 @@ be_structure::gen_out_impl (char *,
   // assignment operator from pointer
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
+  *ci << fname << "::operator= (" << "::" << this->name () 
+      << " *p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "this->ptr_ = p;" << nl;
@@ -640,8 +642,8 @@ be_structure::gen_out_impl (char *,
   // other extra methods - cast operator ()
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
+  *ci << fname << "::operator " << "::" << this->name () 
+      << " *&() // cast" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -650,7 +652,7 @@ be_structure::gen_out_impl (char *,
 
   // ptr function
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
+  *ci << "ACE_INLINE " << "::" << this->name () << " *&" << nl;
   *ci << fname << "::ptr (void) // ptr" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -660,7 +662,7 @@ be_structure::gen_out_impl (char *,
 
   // operator ->
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE " << "::" << this->name () << " *" << nl;
   *ci << fname << "::operator-> (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 686e11af727..3da8f7d3c8c 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -302,19 +302,21 @@ be_union::gen_var_impl (char *,
   // constr from a pointer
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () << " *p)" << nl;
+  *ci << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << this->name () << " *p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{}\n\n";
 
   // copy constructor
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
+  *ci << fname << "::" << lname << " (const ::" << fname <<
     " &p) // copy constructor" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "if (p.ptr_)" << nl;
-  *ci << "  ACE_NEW (this->ptr_, " << this->name () << " (*p.ptr_));" << nl;
+  *ci << "  ACE_NEW (this->ptr_, ::" << this->name () 
+      << " (*p.ptr_));" << nl;
   *ci << "else" << nl;
   *ci << "  this->ptr_ = 0;\n";
   ci->decr_indent ();
@@ -325,11 +327,11 @@ be_union::gen_var_impl (char *,
     {
       *ci << "// fixed-size types only" << nl;
       *ci << "ACE_INLINE" << nl;
-      *ci << fname << "::" << lname << " (const " 
+      *ci << fname << "::" << lname << " (const ::" 
           << this->name () << " &p)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << "ACE_NEW (this->ptr_, " << this->name () 
+      *ci << "ACE_NEW (this->ptr_, ::" << this->name () 
           << " (p));\n";
       ci->decr_indent ();
       *ci << "}\n\n";
@@ -347,9 +349,9 @@ be_union::gen_var_impl (char *,
 
   // assignment operator from a pointer
   ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << this->name () << " *p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "delete this->ptr_;" << nl;
@@ -360,8 +362,8 @@ be_union::gen_var_impl (char *,
 
   // assignment operator from _var
   ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
+  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << fname << "::operator= (const ::" << fname <<
     " &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -369,7 +371,7 @@ be_union::gen_var_impl (char *,
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "delete this->ptr_;" << nl;
-  *ci << "ACE_NEW_RETURN (this->ptr_, " << this->name () 
+  *ci << "ACE_NEW_RETURN (this->ptr_, ::" << this->name () 
       << " (*p.ptr_), *this);\n";
   ci->decr_indent ();
   *ci << "}" << nl;
@@ -382,8 +384,8 @@ be_union::gen_var_impl (char *,
     {
       ci->indent ();
       *ci << "// fixed-size types only" << nl;
-      *ci << "ACE_INLINE " << fname << " &" << nl;
-      *ci << fname << "::operator= (const " << this->name () 
+      *ci << "ACE_INLINE ::" << fname << " &" << nl;
+      *ci << fname << "::operator= (const ::" << this->name () 
           << " &p)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -391,7 +393,7 @@ be_union::gen_var_impl (char *,
       *ci << "{\n";
       ci->incr_indent ();
       *ci << "delete this->ptr_;" << nl;
-      *ci << "ACE_NEW_RETURN (this->ptr_, " 
+      *ci << "ACE_NEW_RETURN (this->ptr_, ::" 
           << this->name () << " (p), *this);\n";
       ci->decr_indent ();
       *ci << "}" << nl;
@@ -402,7 +404,7 @@ be_union::gen_var_impl (char *,
 
   // two arrow operators
   ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE const ::" << this->name () << " *" << nl;
   *ci << fname << "::operator-> (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -411,7 +413,7 @@ be_union::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
   *ci << fname << "::operator-> (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -422,7 +424,7 @@ be_union::gen_var_impl (char *,
   // other extra methods - 3 cast operator ()
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << this->name () 
+  *ci << fname << "::operator const ::" << this->name () 
       << " &() const // cast" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -432,7 +434,8 @@ be_union::gen_var_impl (char *,
 
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () << " &() // cast " << nl;
+  *ci << fname << "::operator ::" << this->name () 
+      << " &() // cast " << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -441,7 +444,7 @@ be_union::gen_var_impl (char *,
 
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () 
+  *ci << fname << "::operator ::" << this->name () 
       << " &() const// cast " << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -455,7 +458,7 @@ be_union::gen_var_impl (char *,
       ci->indent ();
       *ci << "// variable-size types only" << nl;
       *ci << "ACE_INLINE" << nl;
-      *ci << fname << "::operator " << this->name () 
+      *ci << fname << "::operator ::" << this->name () 
           << " *&() // cast " << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -466,7 +469,7 @@ be_union::gen_var_impl (char *,
 
   // in, inout, out, _retn, and ptr
   ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " &" << nl;
+  *ci << "ACE_INLINE const ::" << this->name () << " &" << nl;
   *ci << fname << "::in (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -475,7 +478,7 @@ be_union::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " &" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " &" << nl;
   *ci << fname << "::inout (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -488,7 +491,7 @@ be_union::gen_var_impl (char *,
   if (this->size_type () == be_decl::VARIABLE)
     {
       *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE " << this->name () << " *&" << nl;
+      *ci << "ACE_INLINE ::" << this->name () << " *&" << nl;
       *ci << fname << "::out (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -499,11 +502,11 @@ be_union::gen_var_impl (char *,
       *ci << "}\n\n";
 
       ci->indent ();
-      *ci << "ACE_INLINE " << this->name () << " *" << nl;
+      *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
       *ci << fname << "::_retn (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << this->name () << " *tmp = this->ptr_;" << nl;
+      *ci << "::" << this->name () << " *tmp = this->ptr_;" << nl;
       *ci << "this->ptr_ = 0;" << nl;
       *ci << "return tmp;\n";
       ci->decr_indent ();
@@ -513,7 +516,7 @@ be_union::gen_var_impl (char *,
   else
     {
       *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE " << this->name () << " &" << nl;
+      *ci << "ACE_INLINE ::" << this->name () << " &" << nl;
       *ci << fname << "::out (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -522,7 +525,7 @@ be_union::gen_var_impl (char *,
       *ci << "}\n\n";
 
       ci->indent ();
-      *ci << "ACE_INLINE " << this->name () << nl;
+      *ci << "ACE_INLINE ::" << this->name () << nl;
       *ci << fname << "::_retn (void)" << nl;
       *ci << "{\n";
       ci->incr_indent ();
@@ -533,7 +536,7 @@ be_union::gen_var_impl (char *,
 
   // the additional ptr () member function
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
   *ci << fname << "::ptr (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -650,7 +653,8 @@ be_union::gen_out_impl (char *,
   // constr from a pointer
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () << " *&p)" << nl;
+  *ci << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << this->name () << " *&p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -661,8 +665,8 @@ be_union::gen_out_impl (char *,
   // constructor from _var &
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
+  *ci << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << this->name () << "_var &p) // constructor from _var" << nl;
   *ci << "  : ptr_ (p.out ())" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -674,19 +678,21 @@ be_union::gen_out_impl (char *,
   // copy constructor
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << fname << "&,p).ptr_)" << nl;
+  *ci << fname << "::" << lname << " (const ::" << fname 
+      << " &p) // copy constructor" << nl;
+  *ci << "  : ptr_ (ACE_const_cast (" << ACE_GLOBAL_COLONS 
+      << fname << "&, p).ptr_)" << nl;
   *ci << "{}\n\n";
 
   // assignment operator from _out &
   ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << fname << "::operator= (const ::" << fname 
+      << " &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
+  *ci << "this->ptr_ = ACE_const_cast (" << ACE_GLOBAL_COLONS 
+      << fname << "&, p).ptr_;" << nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -695,9 +701,9 @@ be_union::gen_out_impl (char *,
 
   // assignment operator from pointer
   ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << this->name () << " *p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "this->ptr_ = p;" << nl;
@@ -708,8 +714,8 @@ be_union::gen_out_impl (char *,
   // other extra methods - cast operator ()
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
+  *ci << fname << "::operator ::" << this->name () 
+      << " *&() // cast" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -718,7 +724,7 @@ be_union::gen_out_impl (char *,
 
   // ptr function
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *&" << nl;
   *ci << fname << "::ptr (void) // ptr" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -728,7 +734,7 @@ be_union::gen_out_impl (char *,
 
   // operator ->
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
   *ci << fname << "::operator-> (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
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 1f7eb4b6f44..8dbeb443d03 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -64,7 +64,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "// default constructor" << be_nl;
       *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
       *os << "  : CORBA_UserException ("
-          << node->tc_name () << ")\n";
+          << "::" << node->tc_name () << ")\n";
       *os << "{" << be_nl;
       *os << "}\n\n";
 
@@ -78,7 +78,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       // copy constructor
       os->indent ();
       *os << "// copy constructor" << be_nl;
-      *os << node->name () << "::" << node->local_name () << " (const " 
+      *os << node->name () << "::" << node->local_name () << " (const ::" 
           << node->name () << " &_tao_excp)" << be_nl;
       *os << "  : CORBA_UserException (" 
           << "_tao_excp._type ())" << be_nl;
@@ -104,7 +104,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       os->indent ();
       *os << "// assignment operator" << be_nl;
       *os << node->name () << "&" << be_nl;
-      *os << node->name () << "::operator= (const "
+      *os << node->name () << "::operator= (const ::"
 	        << node->name () << " &_tao_excp)" << be_nl
 	        << "{\n" << be_idt_nl
 	        << "this->CORBA_UserException::operator= "
@@ -135,7 +135,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       os->incr_indent ();
       *os << "if (!ACE_OS::strcmp (\"" << node->repoID () 
           << "\", exc->_id ())) // same type" << be_nl;
-      *os << "  return ACE_dynamic_cast (" << node->name () << "_ptr, exc);" 
+      *os << "  return ACE_dynamic_cast (::" << node->name () << "_ptr, exc);" 
           << be_nl;
       *os << "else" << be_nl;
       *os << "  return 0;\n";
@@ -155,7 +155,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "::_alloc (void)" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "CORBA::Exception *retval = 0;" << be_nl
-          << "ACE_NEW_RETURN (retval, " << node->name () << ", 0);" << be_nl
+          << "ACE_NEW_RETURN (retval, ::" << node->name () 
+          << ", 0);" << be_nl
           << "return retval;" << be_uidt_nl;
       *os << "}\n\n";
 
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 c9053c723a8..e3695172ca8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -46,14 +46,6 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   TAO_OutStream *os; // output stream
   long i;            // loop index
 
-  be_type *bt;
-
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
                                                    // not imported
     {
@@ -185,7 +177,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // g++ problems
       *os << "static " << node->local_name () << "_ptr _nil (void)"
           << be_idt_nl << "{" << be_idt_nl
-          << "return (" << bt->nested_type_name (this->ctx_->scope ())
+          << "return (" << ACE_GLOBAL_COLONS << node->full_name ()
           << "_ptr)0;" << be_uidt_nl
           << "}" << be_uidt << "\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
index 66b934dc83f..ec89f91d9a9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
@@ -54,22 +54,6 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "TAO_Stub *stub" << be_uidt_nl
       << ")" << be_idt_nl;
 
-  // We shouldn't have to call a default base class constructor explicitly
-#if 0
-  if (node->is_nested ())
-    {
-      be_decl* scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      *os << ": ACE_NESTED_CLASS (" << scope->full_name () << ","
-          << node->local_name () << ") ()," << be_nl;
-    }
-  else
-    {
-      *os << ": " << node->full_name () << " ()," << be_nl;
-    }
-#endif
-
-  // If the above goes back in, this goes out.
   *os << ":";
 
   // @@ We should call the constructor for all base classes, since we
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
index 2254e9e9646..74890611d05 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
@@ -226,19 +226,21 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   // constr from a _ptr
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->name () << " *p)" << be_nl;
+  *os << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << node->name () << " *p)" << be_nl;
   *os << "  : ptr_ (p)" << be_nl;
   *os << "{}\n\n";
 
   // copy constructor
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname <<
+  *os << fname << "::" << lname << " (const ::" << fname <<
     " &p) // copy constructor" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "if (p.ptr_)" << be_idt_nl;
-  *os << "ACE_NEW (this->ptr_, " << node->name () << " (*p.ptr_));" << be_uidt_nl;
+  *os << "ACE_NEW (this->ptr_, ::" << node->name () 
+      << " (*p.ptr_));" << be_uidt_nl;
   *os << "else" << be_nl;
   *os << "  this->ptr_ = 0;\n";
   os->decr_indent ();
@@ -249,11 +251,11 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
     {
       *os << "// fixed-size base types only" << be_nl;
       *os << "ACE_INLINE" << be_nl;
-      *os << fname << "::" << lname << " (const " 
+      *os << fname << "::" << lname << " (const ::" 
           << node->name () << " &p)" << be_nl;
       *os << "{\n";
       os->incr_indent ();
-      *os << "ACE_NEW (this->ptr_, " << node->name () 
+      *os << "ACE_NEW (this->ptr_, ::" << node->name () 
           << " (p));\n";
       os->decr_indent ();
       *os << "}\n\n";
@@ -272,8 +274,8 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   // assignment operator from a pointer
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << node->name () <<
-    " *p)" << be_nl;
+  *os << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << node->name () << " *p)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "delete this->ptr_;" << be_nl;
@@ -285,7 +287,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   // assignment operator from _var
   os->indent ();
   *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname <<
+  *os << fname << "::operator= (const ::" << fname <<
     " &p) // deep copy" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -293,7 +295,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   *os << "{\n";
   os->incr_indent ();
   *os << "delete this->ptr_;" << be_nl;
-  *os << "ACE_NEW_RETURN (this->ptr_, " 
+  *os << "ACE_NEW_RETURN (this->ptr_, ::" 
       << node->name () << " (*p.ptr_), *this);\n";
   os->decr_indent ();
   *os << "}" << be_nl;
@@ -306,8 +308,8 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
     {
       os->indent ();
       *os << "// fixed-size types only" << be_nl;
-      *os << "ACE_INLINE " << fname << " &" << be_nl;
-      *os << fname << "::operator= (const " << node->name () 
+      *os << "ACE_INLINE ::" << fname << " &" << be_nl;
+      *os << fname << "::operator= (const ::" << node->name () 
           << " &p)" << be_nl;
       *os << "{\n";
       os->incr_indent ();
@@ -315,7 +317,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
       *os << "{\n";
       os->incr_indent ();
       *os << "delete this->ptr_;" << be_nl;
-      *os << "ACE_NEW_RETURN (this->ptr_, " 
+      *os << "ACE_NEW_RETURN (this->ptr_, ::" 
           << node->name () << " (p), *this);\n";
       os->decr_indent ();
       *os << "}" << be_nl;
@@ -326,7 +328,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
   // two arrow operators
   os->indent ();
-  *os << "ACE_INLINE const " << node->name () << " *" << be_nl;
+  *os << "ACE_INLINE const ::" << node->name () << " *" << be_nl;
   *os << fname << "::operator-> (void) const" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -335,7 +337,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   *os << "}\n\n";
 
   os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " *" << be_nl;
   *os << fname << "::operator-> (void)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -346,8 +348,8 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   // other extra methods - 3 cast operator ()
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator const " << node->name () <<
-    " &() const // cast" << be_nl;
+  *os << fname << "::operator const ::" << node->name () 
+      << " &() const // cast" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "return *this->ptr_;\n";
@@ -356,7 +358,8 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << node->name () << " &() // cast " << be_nl;
+  *os << fname << "::operator ::" << node->name () 
+      << " &() // cast " << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "return *this->ptr_;\n";
@@ -365,7 +368,8 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << node->name () << " &() const // cast " << be_nl;
+  *os << fname << "::operator ::" << node->name () 
+      << " &() const // cast " << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "return *this->ptr_;\n";
@@ -378,7 +382,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
       os->indent ();
       *os << "// variable-size types only" << be_nl;
       *os << "ACE_INLINE" << be_nl;
-      *os << fname << "::operator " << node->name () 
+      *os << fname << "::operator ::" << node->name () 
           << " *&() // cast " << be_nl;
       *os << "{\n";
       os->incr_indent ();
@@ -422,7 +426,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
   // in, inout, out, and _retn
   os->indent ();
-  *os << "ACE_INLINE const " << node->name () << " &" << be_nl;
+  *os << "ACE_INLINE const ::" << node->name () << " &" << be_nl;
   *os << fname << "::in (void) const" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -431,7 +435,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   *os << "}\n\n";
 
   os->indent ();
-  *os << "ACE_INLINE " << node->name () << " &" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " &" << be_nl;
   *os << fname << "::inout (void)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -441,7 +445,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
   os->indent ();
   *os << "// mapping for variable size " << be_nl;
-  *os << "ACE_INLINE " << node->name () << " *&" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " *&" << be_nl;
   *os << fname << "::out (void)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -452,11 +456,11 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
   *os << "}\n\n";
 
   os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " *" << be_nl;
   *os << fname << "::_retn (void)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
-  *os << node->name () << " *tmp = this->ptr_;" << be_nl;
+  *os << "::" << node->name () << " *tmp = this->ptr_;" << be_nl;
   *os << "this->ptr_ = 0;" << be_nl;
   *os << "return tmp;\n";
   os->decr_indent ();
@@ -464,7 +468,7 @@ be_visitor_sequence_ci::gen_var_impl (be_sequence *node)
 
   // the additional ptr () member function
   os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " *" << be_nl;
   *os << fname << "::ptr (void) const" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -514,7 +518,8 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
   // constr from a pointer
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->name () << " *&p)" << be_nl;
+  *os << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << node->name () << " *&p)" << be_nl;
   *os << "  : ptr_ (p)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -525,8 +530,8 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
   // constructor from _var &
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (" << node->name () <<
-    "_var &p) // constructor from _var" << be_nl;
+  *os << fname << "::" << lname << " (" << ACE_GLOBAL_COLONS 
+      << node->name () << "_var &p) // constructor from _var" << be_nl;
   *os << "  : ptr_ (p.out ())" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -538,21 +543,21 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
   // copy constructor
   os->indent ();
   *os << "ACE_INLINE" << be_nl;
-  *os << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << be_nl;
-  *os << "  : ptr_ (ACE_const_cast (" << fname
-      << "&,p).ptr_)" << be_nl;
+  *os << fname << "::" << lname << " (const ::" << fname 
+      << " &p) // copy constructor" << be_nl;
+  *os << "  : ptr_ (ACE_const_cast (" << ACE_GLOBAL_COLONS 
+      << fname << "&, p).ptr_)" << be_nl;
   *os << "{}\n\n";
 
   // assignment operator from _out &
   os->indent ();
-  *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (const " << fname <<
+  *os << "ACE_INLINE ::" << fname << " &" << be_nl;
+  *os << fname << "::operator= (const ::" << fname <<
     " &p)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
-  *os << "this->ptr_ = ACE_const_cast (" << fname
-      << "&,p).ptr_;" << be_nl;
+  *os << "this->ptr_ = ACE_const_cast (" << ACE_GLOBAL_COLONS 
+      << fname << "&, p).ptr_;" << be_nl;
   *os << "return *this;\n";
   os->decr_indent ();
   *os << "}\n\n";
@@ -561,9 +566,9 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
 
   // assignment operator from pointer
   os->indent ();
-  *os << "ACE_INLINE " << fname << " &" << be_nl;
-  *os << fname << "::operator= (" << node->name () <<
-    " *p)" << be_nl;
+  *os << "ACE_INLINE ::" << fname << " &" << be_nl;
+  *os << fname << "::operator= (" << ACE_GLOBAL_COLONS 
+      << node->name () << " *p)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "this->ptr_ = p;" << be_nl;
@@ -574,8 +579,8 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
   // other extra methods - cast operator ()
   os->indent ();
   *os << "ACE_INLINE " << be_nl;
-  *os << fname << "::operator " << node->name () <<
-    " *&() // cast" << be_nl;
+  *os << fname << "::operator ::" << node->name () 
+      << " *&() // cast" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "return this->ptr_;\n";
@@ -584,7 +589,7 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
 
   // ptr function
   os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *&" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " *&" << be_nl;
   *os << fname << "::ptr (void) // ptr" << be_nl;
   *os << "{\n";
   os->incr_indent ();
@@ -594,7 +599,7 @@ be_visitor_sequence_ci::gen_out_impl (be_sequence *node)
 
   // operator ->
   os->indent ();
-  *os << "ACE_INLINE " << node->name () << " *" << be_nl;
+  *os << "ACE_INLINE ::" << node->name () << " *" << be_nl;
   *os << fname << "::operator-> (void)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index 42381edd7df..c823582f2c1 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -152,7 +152,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
       *os << "// copy constructor" << be_nl;
       *os << node->name () << "::" << node->local_name ()
-          << " (const " << node->name () << " &u)" << be_nl
+          << " (const ::" << node->name () << " &u)" << be_nl
           << "  : TAO_Base_Union ()" << be_nl;
       *os << "{" << be_idt_nl;
       *os << "this->disc_ = u.disc_;" << be_nl;
@@ -188,7 +188,8 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
       os->indent ();
       *os << "// destructor" << be_nl
-          << node->name () << "::~" << node->local_name () << " (void)" << be_nl
+          << node->name () << "::~" << node->local_name () 
+          << " (void)" << be_nl
           << "{" << be_idt_nl
           << "// finalize" << be_nl
           << "this->_reset (this->disc_, 1);" << be_uidt_nl
@@ -203,8 +204,8 @@ int be_visitor_union_cs::visit_union (be_union *node)
       os->indent ();
       *os << "// assignment operator" << be_nl;
       *os << node->name () << " &" << be_nl; // return type
-      *os << node->name () << "::operator= (const " <<
-        node->name () << " &u)" << be_nl;
+      *os << node->name () << "::operator= (const ::" 
+          << node->name () << " &u)" << be_nl;
       *os << "{\n";
       os->incr_indent ();
       // first reset and set the discriminant