ChangeLogTag: Fri Aug 12 22:13:15 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

10 files changed, 73 insertions, 71 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index b2a7107704f..e3ce91e1e40 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -54,22 +54,22 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
   // Generate the Any <<= and >>= operators.
   *os << be_global->stub_export_macro ();
   *os << " void"
-      << " operator<<= (CORBA::Any &, const ";
+      << " operator<<= ( ::CORBA::Any &, const ";
   *os << node->name ();
   *os << " &); // copying version" << be_nl;
   *os << be_global->stub_export_macro ();
   *os << " void"
-      << " operator<<= (CORBA::Any &, ";
+      << " operator<<= ( ::CORBA::Any &, ";
   *os << node->name ();
   *os << "*); // noncopying version" << be_nl;
   *os << be_global->stub_export_macro ();
-  *os << " CORBA::Boolean"
-      << " operator>>= (const CORBA::Any &, ";
+  *os << " ::CORBA::Boolean"
+      << " operator>>= (const ::CORBA::Any &, ";
   *os << node->name ();
   *os << " *&); // deprecated" << be_nl;
   *os << be_global->stub_export_macro ();
-  *os << " CORBA::Boolean"
-      << " operator>>= (const CORBA::Any &, const ";
+  *os << " ::CORBA::Boolean"
+      << " operator>>= (const ::CORBA::Any &, const ";
   *os << node->name ();
   *os << " *&);";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index e54c1ebee72..577ca1ecc3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -64,7 +64,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       *os << "namespace TAO" << be_nl
           << "{" << be_idt_nl
           << "template<>" << be_nl
-          << "CORBA::Boolean" << be_nl
+          << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
@@ -73,7 +73,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
       *os << be_nl << be_nl
           << "template<>" << be_nl
-          << "CORBA::Boolean" << be_nl
+          << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
@@ -85,7 +85,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   // Copying insertion.
   *os << be_nl << "// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
-      << "CORBA::Any &_tao_any," << be_nl
+      << "::CORBA::Any &_tao_any," << be_nl
       << "const " << node->name () << " &_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -101,7 +101,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   // Non-copying insertion.
   *os << "// Non-copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
-      << "CORBA::Any &_tao_any," << be_nl
+      << "::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -116,8 +116,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
   // Extraction to non-const pointer (deprecated, just calls the other).
   *os << "// Extraction to non-const pointer (deprecated)." << be_nl
-      << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
-      << "const CORBA::Any &_tao_any," << be_nl
+      << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+      << "const ::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *&_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -129,8 +129,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
   // Extraction to const pointer.
   *os << "// Extraction to const pointer." << be_nl
-      << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
-      << "const CORBA::Any &_tao_any," << be_nl
+      << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+      << "const ::CORBA::Any &_tao_any," << be_nl
       << "const " << node->name () << " *&_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
index f1273d74604..7764d7fc244 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
@@ -70,6 +70,8 @@ be_visitor_sequence_buffer_type::visit_predefined_type (be_predefined_type *node
 {
   TAO_OutStream *os = this->ctx_->stream ();
   AST_PredefinedType::PredefinedType pt = node->pt ();
+  
+  *os << "::";
 
   if (pt == AST_PredefinedType::PT_pseudo
       || pt == AST_PredefinedType::PT_object)
@@ -214,7 +216,7 @@ be_visitor_sequence_buffer_type::visit_string (be_string *node)
     }
   else
     {
-      *os << "CORBA::WChar *";
+      *os << "::CORBA::WChar *";
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index 6d3e7c3f5fa..6b0e1e24d2b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -80,12 +80,12 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node)
     }
 
   *os << be_nl << be_nl 
-      << be_global->stub_export_macro () << " CORBA::Boolean"
+      << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &," << be_nl
       << "const " << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt_nl;
-  *os << be_global->stub_export_macro () << " CORBA::Boolean"
+  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &," << be_nl
       << node->name () << " &" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 87844c3c482..c39a071c650 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -103,7 +103,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
-  *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl
+  *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->name ()
       << " &_tao_sequence" << be_uidt_nl
@@ -111,7 +111,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl;
 
   // First encode the sequence length.
-  *os << "const CORBA::ULong _tao_seq_len = _tao_sequence.length ();"
+  *os << "const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();"
       << be_nl << be_nl;
   *os << "if (strm << _tao_seq_len)" << be_idt_nl
       << "{" << be_idt_nl;
@@ -143,7 +143,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
   //  Set the sub state as generating code for the input operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
 
-  *os << "CORBA::Boolean operator>> (" << be_idt << be_idt_nl
+  *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &";
 
   if (! bt->is_local ())
@@ -166,7 +166,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
   if (! bt->is_local ())
     {
       // First retrieve the length and adjust the sequence length accordingly.
-      *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
+      *os << "::CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
       *os << "if (strm >> _tao_seq_len)" << be_idt_nl
           << "{" << be_idt_nl;
 
@@ -392,8 +392,8 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (
                 << "strm.orb_core ()->resource_factory ()->" << be_nl
                 << "input_cdr_allocator_type_locked () == 1)" << be_nl
                 << "{" << be_idt_nl
-                << "TAO_Unbounded_Sequence<CORBA::Octet> *oseq = " << be_nl
-                << "  static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> ("
+                << "TAO_Unbounded_Sequence< ::CORBA::Octet> *oseq = " << be_nl
+                << "  static_cast<TAO_Unbounded_Sequence< ::CORBA::Octet> *> ("
                 << "&_tao_sequence);" << be_nl
                 << "oseq->replace (_tao_seq_len, strm.start ());"
                 << be_nl
@@ -410,8 +410,8 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (
         case TAO_CodeGen::TAO_CDR_OUTPUT:
           {
             *os << "{" << be_idt_nl
-                << "TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = " << be_nl
-                << "  static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> "
+                << "TAO_Unbounded_Sequence< ::CORBA::Octet> *_tao_octet_seq = " << be_nl
+                << "  static_cast<TAO_Unbounded_Sequence< ::CORBA::Octet> *> "
                 << "(const_cast<" << sequence->name () << " *> (&_tao_sequence));" << be_nl
                 << "if (_tao_octet_seq->mb ())" << be_idt_nl
                 << "return strm.write_octet_array_mb (_tao_octet_seq->mb ());"
@@ -597,7 +597,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
   be_visitor_sequence_base visitor (&ctx);
 
   // Initialize a boolean variable.
-  *os << "CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
+  *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
 
   // We get here if the "type" of individual elements of the sequence is not a
   // primitive type. In this case, we are left with no other alternative but
@@ -616,7 +616,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
 
   if (expr->ev ()->et == AST_Expression::EV_ulong)
     {
-      *os << "for (CORBA::ULong i = 0; i < _tao_seq_len"
+      *os << "for ( ::CORBA::ULong i = 0; i < _tao_seq_len"
           << " && _tao_marshal_flag; "
           << "++i)" << be_idt_nl
           << "{" << be_idt_nl;
@@ -719,12 +719,12 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                 if (str->width () == (long) sizeof (char))
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "CORBA::Any::to_string (_tao_sequence[i].out (), ";
+                        << "::CORBA::Any::to_string (_tao_sequence[i].out (), ";
                   }
                 else
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
+                        << "::CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
                   }
 
                 *os << str->max_size ()->ev ()->u.ulval << "));"
@@ -767,22 +767,22 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_char (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_wchar (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_boolean (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_octet (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
@@ -884,22 +884,22 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_char (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_wchar (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_boolean (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_octet (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
index 868f54e6778..abf654712a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
@@ -42,7 +42,7 @@ be_visitor_sequence_base::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << node->name ();
+  *os << "::" << node->name ();
 
   return 0;
 }
@@ -283,12 +283,12 @@ be_visitor_sequence_base_template_args::visit_predefined_type (
   )
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << node->name ();
+  *os << "::" << node->name ();
 
   if (beseq_->managed_type () == be_sequence::MNG_PSEUDO
       || beseq_->managed_type () == be_sequence::MNG_OBJREF)
     {
-      *os << "," << node->name () << "_var";
+      *os << ", ::" << node->name () << "_var";
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 71e91b040c0..cc10b86b3bb 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -140,7 +140,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   if (node->unbounded ())
     {
       *os << be_nl
-          << node->local_name () << " (CORBA::ULong max);";
+          << node->local_name () << " ( ::CORBA::ULong max);";
     }
 
   *os << be_nl
@@ -149,11 +149,11 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   if (node->unbounded ())
     {
       *os << be_nl
-          << "CORBA::ULong max,";
+          << "::CORBA::ULong max,";
     }
 
   *os << be_nl
-      << "CORBA::ULong length," << be_nl;
+      << "::CORBA::ULong length," << be_nl;
 
   // Generate the base type for the buffer.
   be_visitor_context ctx (*this->ctx_);
@@ -170,7 +170,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
     }
 
   *os << "* buffer, " << be_nl
-      << "CORBA::Boolean release = 0" << be_uidt_nl
+      << "::CORBA::Boolean release = 0" << be_uidt_nl
       << ");" << be_uidt_nl;
   *os << node->local_name () << " (const " << node->local_name ()
       << " &);" << be_nl;
@@ -217,10 +217,10 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
     {
       *os << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl
                 << node->local_name () << " (" << be_idt << be_idt_nl
-                << "CORBA::ULong length," << be_nl
+                << "::CORBA::ULong length," << be_nl
                 << "const ACE_Message_Block* mb" << be_uidt_nl
                 << ")" << be_uidt_nl
-                << "  : TAO_Unbounded_Sequence<CORBA::Octet>"
+                << "  : TAO_Unbounded_Sequence< ::CORBA::Octet>"
                 << " (length, mb) {}" << "\n"
                 << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index 0cd0db25ae1..63782abb8d7 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -77,7 +77,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       *os << be_nl << be_nl
           << node->name () << "::" << node->local_name () << " ("
           << be_idt << be_idt_nl
-          << "CORBA::ULong max" << be_uidt_nl
+          << "::CORBA::ULong max" << be_uidt_nl
           << ")" << be_nl
           << ": " << be_idt;
 
@@ -104,10 +104,10 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
   if (node->unbounded ())
     {
       // Unbounded seq takes this extra parameter.
-      *os << "CORBA::ULong max," << be_nl;
+      *os << "::CORBA::ULong max," << be_nl;
     }
 
-  *os << "CORBA::ULong length," << be_nl;
+  *os << "::CORBA::ULong length," << be_nl;
 
   // generate the base type for the buffer
   be_visitor_context ctx (*this->ctx_);
@@ -123,7 +123,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
     }
 
   *os << " * buffer," << be_nl
-      << "CORBA::Boolean release" << be_uidt_nl
+      << "::CORBA::Boolean release" << be_uidt_nl
       << ")" << be_uidt_nl
       << "  : " << be_idt << be_idt;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
index 52dd795af45..cc9216fa8fb 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
@@ -82,7 +82,7 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node)
   *os << be_nl << be_nl;
 
   *os << be_global->stub_export_macro () 
-      << " CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
+      << " ::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
       << "const " << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt_nl;
   *os << be_global->stub_export_macro () 
@@ -95,12 +95,12 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node)
       << ");" << be_uidt_nl;
 
   *os << be_nl << be_nl 
-      << be_global->stub_export_macro () << " CORBA::Boolean"
+      << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator<< (" << be_idt << be_idt_nl
       << "TAO::DCPS::Serializer &," << be_nl
       << "const " << node->name () << " &" << be_uidt_nl
       << ");" << be_uidt_nl;
-  *os << be_global->stub_export_macro () << " CORBA::Boolean"
+  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
       << " operator>> (" << be_idt << be_idt_nl
       << "TAO::DCPS::Serializer &," << be_nl
       << node->name () << " &" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
index 0444ac022d0..9315abf7321 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
@@ -103,7 +103,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
   // --- _tao_is_bounded_size ---
   this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE);
 
-  *os << "CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
+  *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl
       << "const " << node->name ()
       << " &_tao_sequence" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -191,7 +191,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
   //  Set the sub state as generating code for the output operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
 
-  *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl
+  *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO::DCPS::Serializer &strm," << be_nl
       << "const " << node->name ()
       << " &_tao_sequence" << be_uidt_nl
@@ -199,7 +199,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl;
 
   // First encode the sequence length.
-  *os << "const CORBA::ULong _tao_seq_len = _tao_sequence.length ();"
+  *os << "const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();"
       << be_nl << be_nl;
   *os << "if (strm << _tao_seq_len)" << be_idt_nl
       << "{" << be_idt_nl;
@@ -233,7 +233,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
   //  Set the sub state as generating code for the input operator.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
 
-  *os << "CORBA::Boolean operator>> (" << be_idt << be_idt_nl
+  *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
       << "TAO::DCPS::Serializer &";
 
   if (! bt->is_local ())
@@ -256,7 +256,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
   if (! bt->is_local ())
     {
       // First retrieve the length and adjust the sequence length accordingly.
-      *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
+      *os << "::CORBA::ULong _tao_seq_len;" << be_nl << be_nl;
       *os << "if (strm >> _tao_seq_len)" << be_idt_nl
           << "{" << be_idt_nl;
 
@@ -933,7 +933,7 @@ switch (this->ctx_->sub_state ())
       {
         *os << "//iterate over the sequence to find the current size" << be_nl
             << "size_t the_length = _dcps_max_marshaled_size_ulong ();" << be_nl
-            << "for (CORBA::ULong i = 0; i < _tao_sequence.length(); "
+            << "for ( ::CORBA::ULong i = 0; i < _tao_sequence.length(); "
             << "++i)" << be_idt_nl
             << "{" << be_idt_nl;
 
@@ -1011,12 +1011,12 @@ switch (this->ctx_->sub_state ())
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       {
     // Initialize a boolean variable.
-  *os << "CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl;
+  *os << "::CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl;
 
 
   if (expr->ev ()->et == AST_Expression::EV_ulong)
     {
-      *os << "for (CORBA::ULong i = 0; i < _tao_seq_len"
+      *os << "for ( ::CORBA::ULong i = 0; i < _tao_seq_len"
           << " && _tao_marshal_flag; "
           << "++i)" << be_idt_nl
           << "{" << be_idt_nl;
@@ -1110,12 +1110,12 @@ switch (this->ctx_->sub_state ())
                 if (str->width () == (long) sizeof (char))
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "CORBA::Any::to_string (_tao_sequence[i].out (), ";
+                        << "::CORBA::Any::to_string (_tao_sequence[i].out (), ";
                   }
                 else
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
+                        << "::CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
                   }
 
                 *os << str->max_size ()->ev ()->u.ulval << "));"
@@ -1157,22 +1157,22 @@ switch (this->ctx_->sub_state ())
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_char (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_wchar (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_boolean (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> CORBA::Any::to_octet (_tao_sequence[i]));"
+                      << "(strm >> ::CORBA::Any::to_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
@@ -1271,22 +1271,22 @@ switch (this->ctx_->sub_state ())
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_char (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_wchar (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_boolean (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << CORBA::Any::from_octet (_tao_sequence[i]));"
+                      << "(strm << ::CORBA::Any::from_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default: