ChangeLogTag:Thu Feb 20 13:57:36 2003 Ossama Othman <ossama@uci.edu>

5 files changed, 21 insertions, 22 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index 0666343ff6f..aa9b24ce25c 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -316,7 +316,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl
-      << "return this->CORBA_Object::_is_a (" << be_idt << be_idt_nl
+      << "return this->Object::_is_a (" << be_idt << be_idt_nl
       << "value" << be_nl
       << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
@@ -518,4 +518,3 @@ be_visitor_component_cs::gen_unchecked_narrow (be_component *node,
 
   *os << "}" << be_nl << be_nl;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index f4455fd2e63..82e95785b2b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -67,7 +67,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   os->gen_ifdef_macro (class_name);
 
   *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro () 
+      << "class " << be_global->stub_export_macro ()
       << " " << class_name << be_idt_nl
       << ": public TAO_Bounded_Base_Sequence" << be_uidt_nl
       << "{" << be_nl
@@ -182,10 +182,10 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       *os << be_nl << be_nl
           << "virtual void _downcast (" << be_idt << be_idt_nl
           << "void* target," << be_nl
-          << "CORBA_Object *src" << be_nl
+          << "CORBA::Object *src" << be_nl
           << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
           << ");" << be_uidt_nl;
-      *os << "virtual CORBA_Object* _upcast (void *src) const;";
+      *os << "virtual CORBA::Object* _upcast (void *src) const;";
     }
 
   *os << be_uidt_nl << "};";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 8f3dc5e6e8d..69e49347283 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -19,8 +19,8 @@
 //    Modifications by Aniruddha Gokhale
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           gen_bounded_obj_sequence_cs, 
+ACE_RCSID (be_visitor_sequence,
+           gen_bounded_obj_sequence_cs,
            "$Id$")
 
 int
@@ -114,7 +114,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   // some compilers give lots of warnings.
 
   // Allocate_buffer.
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "// The Base_Sequence functions, please see tao/sequence.h"
       << be_nl
       << "void " << be_nl
@@ -219,7 +219,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       *os << "void" << be_nl
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
                 << "void* target," << be_nl
-                << "CORBA_Object *src" << be_nl
+                << "CORBA::Object *src" << be_nl
                 << "ACE_ENV_ARG_DECL" << be_uidt_nl
                 << ")" << be_uidt_nl
                 << "{" << be_idt_nl;
@@ -249,7 +249,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
           << "ACE_CHECK;" << be_uidt_nl
           << "}\n" << be_nl;
 
-      *os << "CORBA_Object*" << be_nl
+      *os << "CORBA::Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
           << "{" << be_idt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
index 592fe5e938b..364ac9dffaa 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
@@ -20,8 +20,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           gen_unbounded_obj_sequence_ch, 
+ACE_RCSID (be_visitor_sequence,
+           gen_unbounded_obj_sequence_ch,
            "$Id$")
 
 int
@@ -65,7 +65,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   os->gen_ifdef_macro (class_name);
 
   *os << be_nl << be_nl
-      << "class " << be_global->stub_export_macro () 
+      << "class " << be_global->stub_export_macro ()
       << " " << class_name << be_idt_nl
       << ": public TAO_Unbounded_Base_Sequence" << be_uidt_nl
       << "{" << be_nl
@@ -111,7 +111,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
 
   int is_pseudo_object =
     nt == AST_Decl::NT_pre_defined
-    && prim 
+    && prim
     && prim->pt () == AST_PredefinedType::PT_pseudo;
 
   if (is_pseudo_object)
@@ -123,7 +123,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
       *os << "TAO_Valuetype_Manager<";
     }
   else if (node->base_type ()->is_abstract ())
-    { 
+    {
       *os << "TAO_Abstract_Manager<";
     }
   else
@@ -185,11 +185,11 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
       *os << be_nl << be_nl
           << "virtual void _downcast (" << be_idt << be_idt_nl
           << "void* target," << be_nl
-          << "CORBA_Object *src" << be_nl
+          << "CORBA::Object *src" << be_nl
           << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
           << ");" << be_uidt_nl;
 
-      *os << "virtual CORBA_Object* _upcast (void *src) const;";
+      *os << "virtual CORBA::Object* _upcast (void *src) const;";
     }
 
   *os << be_uidt_nl << "};";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index 6cf50cceb52..95706dc7a6e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -19,8 +19,8 @@
 //    Modifications by Aniruddha Gokhale
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           gen_unbounded_obj_sequence_cs, 
+ACE_RCSID (be_visitor_sequence,
+           gen_unbounded_obj_sequence_cs,
            "$Id$")
 
 int
@@ -293,7 +293,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
 
   if (pt->node_type () != AST_Decl::NT_valuetype
-      && (pt->node_type () != AST_Decl::NT_pre_defined) 
+      && (pt->node_type () != AST_Decl::NT_pre_defined)
       || (prim &&
           prim->pt () == AST_PredefinedType::PT_object))
     {
@@ -301,7 +301,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       *os << "void " << be_nl
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
                 << "void* target," << be_nl
-                << "CORBA_Object *src" << be_nl
+                << "CORBA::Object *src" << be_nl
                 << "ACE_ENV_ARG_DECL" << be_uidt_nl
                 << ")" << be_uidt_nl
                 << "{" << be_idt_nl;
@@ -331,7 +331,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
           << "ACE_CHECK;" << be_uidt_nl
                 << "}\n" << be_nl;
 
-      *os << "CORBA_Object*" << be_nl
+      *os << "CORBA::Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
           << "{" << be_idt_nl;