ChangeLogTag:Thu Feb 20 09:07:56 2003 Ossama Othman <ossama@uci.edu>

18 files changed, 158 insertions, 159 deletions

diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 58721933e8f..b6c261b2322 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 // =================================================================
 //
@@ -24,7 +23,11 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID(DynamicAny, DynAnyFactory, "$Id$")
+
+ACE_RCSID (DynamicAny,
+           DynAnyFactory,
+           "$Id$")
+
 
 // Constructor from typecode
 TAO_DynAnyFactory::TAO_DynAnyFactory (void)
@@ -34,7 +37,7 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 // Utility function called by all the DynAny classes
 // to extract the TCKind of possibly aliased types.
 CORBA::TCKind
-TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
+TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
                             ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -42,7 +45,8 @@ TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
 
   while (tck == CORBA::tk_alias)
     {
-      CORBA_TypeCode_var temp = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var temp =
+        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::tk_null);
 
       tck = TAO_DynAnyFactory::unalias (temp.in ()
@@ -55,10 +59,10 @@ TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
 
 // Same as above, but returns the type code.
 CORBA::TypeCode_ptr
-TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc
+TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
                                 ACE_ENV_ARG_DECL)
 {
-  CORBA_TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
+  CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
   CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
@@ -101,7 +105,7 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code (
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
+TAO_DynAnyFactory::make_dyn_any (const CORBA::Any &any
                                  ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 7e414a9d273..bb72decaa63 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -44,17 +44,17 @@ public:
   TAO_DynAnyFactory (void);
   // Constructor.
 
-  static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc
+  static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
                                 ACE_ENV_ARG_DECL);
   // Obtain the kind of object, after all aliasing has been removed.
 
-  static CORBA_TypeCode_ptr strip_alias (CORBA_TypeCode_ptr tc
-                                         ACE_ENV_ARG_DECL);
+  static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
+                                          ACE_ENV_ARG_DECL);
   // Same as above, but returns type code instead of TCKind. Caller
   // must release the return value.
 
   static DynamicAny::DynAny_ptr
-     make_dyn_any (const CORBA_Any &any
+     make_dyn_any (const CORBA::Any &any
                    ACE_ENV_ARG_DECL);
   // Create the correct type of DynAny object for <any>.
 
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index dd921bcefcc..ffbad848f3d 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,17 +1,16 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynAny_i.h"
 #include "DynAnyFactory.h"
 
-ACE_RCSID(DynamicAny, DynAny_i, "$Id$")
 
-// Constructor from typecode
+ACE_RCSID (DynamicAny,
+           DynAny_i,
+           "$Id$")
+
+
 TAO_DynAny_i::TAO_DynAny_i (void)
 {
 }
 
-// Destructor
 TAO_DynAny_i::~TAO_DynAny_i (void)
 {
 }
@@ -61,7 +60,7 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
     case CORBA::tk_null:
       break;
     case CORBA::tk_void:
-      this->any_ = CORBA_Any (CORBA::_tc_void);
+      this->any_ = CORBA::Any (CORBA::_tc_void);
       break;
     case CORBA::tk_short:
       this->any_ <<= ACE_static_cast (CORBA::Short, 0);
@@ -148,7 +147,7 @@ TAO_DynAny_i::init_common (void)
 }
 
 void
-TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
+TAO_DynAny_i::init (CORBA::TypeCode_ptr tc
                     ACE_ENV_ARG_DECL)
 {
   this->check_typecode (tc
@@ -165,7 +164,7 @@ TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
 }
 
 void
-TAO_DynAny_i::init (const CORBA_Any& any
+TAO_DynAny_i::init (const CORBA::Any& any
                     ACE_ENV_ARG_DECL)
 {
   this->type_ = any.type ();
@@ -219,7 +218,7 @@ TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type)
 // ****************************************************************
 
 void
-TAO_DynAny_i::from_any (const CORBA_Any &any
+TAO_DynAny_i::from_any (const CORBA::Any &any
                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -263,7 +262,7 @@ TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA_Any_ptr retval;
+  CORBA::Any_ptr retval;
 
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any (this->any_),
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 7f637242846..c304536d27d 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -52,11 +52,11 @@ public:
   ~TAO_DynAny_i (void);
 
   /// Initialize using just a TypeCode
-  void init (CORBA_TypeCode_ptr tc
+  void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
 
   /// Initialize using an Any.
-  void init (const CORBA_Any& any
+  void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
 
   // = LocalObject methods.
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 6802ad3f5ac..f69fc0d5cf1 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynArray_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-ACE_RCSID(DynamicAny, DynArray_i, "$Id$")
 
-// Constructor and destructor,
+ACE_RCSID (DynamicAny,
+           DynArray_i,
+           "$Id$")
+
 
 TAO_DynArray_i::TAO_DynArray_i (void)
 {
@@ -29,7 +28,7 @@ TAO_DynArray_i::init_common (void)
 }
 
 void
-TAO_DynArray_i::init (const CORBA_Any & any
+TAO_DynArray_i::init (const CORBA::Any & any
                       ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
@@ -66,10 +65,10 @@ TAO_DynArray_i::init (const CORBA_Any & any
   for (CORBA::ULong i = 0; i < numfields; i++)
     {
       // This Any constructor is a TAO extension.
-      CORBA_Any field_any (field_tc.in (),
-                           0,
-                           cdr.byte_order (),
-                           cdr.start ());
+      CORBA::Any field_any (field_tc.in (),
+                            0,
+                            cdr.byte_order (),
+                            cdr.start ());
 
       // This recursive step will call the correct constructor
       // based on the type of field_any.
@@ -87,7 +86,7 @@ TAO_DynArray_i::init (const CORBA_Any & any
 }
 
 void
-TAO_DynArray_i::init (CORBA_TypeCode_ptr tc
+TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
                       ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -126,24 +125,24 @@ CORBA::TypeCode_ptr
 TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::TypeCode_var element_type =
-    CORBA_TypeCode::_duplicate (this->type_.in ());
+    CORBA::TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type
   CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   while (kind != CORBA::tk_array)
     {
       element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
     }
 
   // Return the content type.
-  CORBA_TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+  CORBA::TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return retval;
 }
@@ -390,7 +389,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynArray_i::from_any (const CORBA_Any& any
+TAO_DynArray_i::from_any (const CORBA::Any& any
                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -431,7 +430,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
           // This Any constructor is a TAO extension.
-          CORBA_Any field_any (field_tc.in (),
+          CORBA::Any field_any (field_tc.in (),
                                0,
                                cdr.byte_order (),
                                cdr.start ());
@@ -471,7 +470,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_OutputCDR out_cdr;
@@ -498,12 +497,12 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_InputCDR in_cdr (out_cdr);
 
-  CORBA_Any_ptr retval = 0;
+  CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type_.in (),
-                               0,
-                               in_cdr.byte_order (),
-                               in_cdr.start ()),
+                    CORBA::Any (this->type_.in (),
+                                0,
+                                in_cdr.byte_order (),
+                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 083320ad336..f700af3887a 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -52,11 +52,11 @@ public:
   ~TAO_DynArray_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc
+  void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any
+  void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index d240779b1d1..cf7f985a802 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,6 +1,3 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynCommon.h"
 #include "DynAnyFactory.h"
 #include "DynAny_i.h"
@@ -10,14 +7,16 @@
 #include "DynStruct_i.h"
 #include "DynUnion_i.h"
 
-ACE_RCSID(DynamicAny, DynCommon, "$Id$")
 
-// Constructor.
+ACE_RCSID (DynamicAny,
+           DynCommon,
+           "$Id$")
+
+
 TAO_DynCommon::TAO_DynCommon (void)
 {
 }
 
-// Destructor.
 TAO_DynCommon::~TAO_DynCommon (void)
 {
 }
@@ -52,16 +51,17 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA_TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
+  CORBA::Boolean equivalent =
+    this->type_.in ()->equivalent (tc.in ()
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
     {
-      CORBA_Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->from_any (any.in ()
@@ -748,7 +748,7 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA_Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->insert_any (any.in ()
@@ -1415,14 +1415,14 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      CORBA_Any_ptr tmp = 0;
+      CORBA::Any_ptr tmp = 0;
 
       ACE_NEW_THROW_EX (tmp,
-                        CORBA_Any,
+                        CORBA::Any,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
-      CORBA_Any_var val = tmp;
+      CORBA::Any_var val = tmp;
 
       if ((this->any_ >>= *tmp) == 0)
         {
@@ -1450,7 +1450,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA_Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return TAO_DynAnyFactory::make_dyn_any (any.in ()
@@ -1559,7 +1559,7 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
                         DynamicAny::DynAny::_nil ());
     }
 
-  CORBA_Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   DynamicAny::DynAny_ptr retval =
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 950896445a0..b740089e731 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -522,7 +522,7 @@ protected:
   CORBA::TypeCode_var type_;
   // Holder for our type code.
 
-  CORBA_Any any_;
+  CORBA::Any any_;
   // Gets a value only for basic types, but used in insert_*
   // and get_*, defined in this base class.
 
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index b12ddf31c3c..f2f64e38f0d 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynEnum_i.h"
 #include "DynAnyFactory.h"
 
-ACE_RCSID(DynamicAny, DynEnum_i, "$Id$")
 
-// Constructors and destructor
+ACE_RCSID (DynamicAny,
+           DynEnum_i,
+           "$Id$")
+
 
 TAO_DynEnum_i::TAO_DynEnum_i (void)
 {
@@ -28,7 +27,7 @@ TAO_DynEnum_i::init_common (void)
 }
 
 void
-TAO_DynEnum_i::init (const CORBA_Any &any
+TAO_DynEnum_i::init (const CORBA::Any &any
                      ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
@@ -56,7 +55,7 @@ TAO_DynEnum_i::init (const CORBA_Any &any
 }
 
 void
-TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc
+TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc
                      ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -198,7 +197,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
 // ****************************************************************
 
 void
-TAO_DynEnum_i::from_any (const CORBA_Any& any
+TAO_DynEnum_i::from_any (const CORBA::Any& any
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -237,9 +236,9 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   out_cdr.write_ulong (this->value_);
 
-  CORBA_Any *retval;
+  CORBA::Any *retval;
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type_.in (),
+                    CORBA::Any (this->type_.in (),
                                0,
                                TAO_ENCAP_BYTE_ORDER,
                                out_cdr.begin ()),
@@ -267,7 +266,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
       return 0;
     }
 
-  CORBA_Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *mb = any->_tao_get_cdr ();
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index e22b014d863..b852d1851c6 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -52,11 +52,11 @@ public:
   ~TAO_DynEnum_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc
+  void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any
+  void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 731e6a98d16..79f5aab7fcb 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynSequence_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-ACE_RCSID(DynamicAny, DynSequence_i, "$Id$")
 
-// Constructors and destructor.
+ACE_RCSID (DynamicAny,
+           DynSequence_i,
+           "$Id$")
+
 
 TAO_DynSequence_i::TAO_DynSequence_i (void)
 {
@@ -92,7 +91,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any
 }
 
 void
-TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc
+TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
                          ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -160,20 +159,20 @@ TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
 
   // Strip away aliases (if any) on top of the outer type.
   CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   while (kind != CORBA::tk_sequence)
     {
       element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
     }
 
   // Return the content type.
   CORBA::TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return retval;
 }
@@ -650,7 +649,8 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   out_cdr.write_ulong (this->component_count_);
 
-  CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var field_tc =
+    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 98a2957fb78..4f35c40e8ec 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -52,11 +52,11 @@ public:
   ~TAO_DynSequence_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc
+  void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any
+  void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index c94557da2b7..4d01be3991b 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynStruct_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-ACE_RCSID(DynamicAny, DynStruct_i, "$Id$")
 
-// Constructors and destructor.
+ACE_RCSID (DynamicAny,
+           DynStruct_i,
+           "$Id$")
+
 
 TAO_DynStruct_i::TAO_DynStruct_i (void)
 {
@@ -45,7 +44,7 @@ TAO_DynStruct_i::init_common (void)
 }
 
 void
-TAO_DynStruct_i::init (const CORBA_Any& any
+TAO_DynStruct_i::init (const CORBA::Any& any
                        ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
@@ -95,7 +94,7 @@ TAO_DynStruct_i::init (const CORBA_Any& any
       ACE_CHECK;
 
       // This Any constructor is a TAO extension.
-      CORBA_Any field_any (field_tc.in (),
+      CORBA::Any field_any (field_tc.in (),
                            0,
                            cdr.byte_order (),
                            cdr.start ());
@@ -116,7 +115,7 @@ TAO_DynStruct_i::init (const CORBA_Any& any
 }
 
 void
-TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc
+TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
                        ACE_ENV_ARG_DECL)
 {
   this->check_typecode (tc
@@ -475,7 +474,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynStruct_i::from_any (const CORBA_Any & any
+TAO_DynStruct_i::from_any (const CORBA::Any & any
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -520,7 +519,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
           ACE_CHECK;
 
           // This Any constructor is a TAO extension.
-          CORBA_Any field_any (field_tc.in (),
+          CORBA::Any field_any (field_tc.in (),
                                0,
                                cdr.byte_order (),
                                cdr.start ());
@@ -574,11 +573,11 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      CORBA_TypeCode_var field_tc = this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var field_tc = this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
@@ -595,12 +594,12 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_InputCDR in_cdr (out_cdr);
 
-  CORBA_Any_ptr retval = 0;
+  CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type_.in (),
-                               0,
-                               in_cdr.byte_order (),
-                               in_cdr.start ()),
+                    CORBA::Any (this->type_.in (),
+                                0,
+                                in_cdr.byte_order (),
+                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index d5354beb633..84a509df9fb 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -52,11 +52,11 @@ public:
   ~TAO_DynStruct_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc
+  void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any
+  void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index f4983081d25..61374ebafd9 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
 #include "DynUnion_i.h"
 #include "DynAnyFactory.h"
 #include "tao/Marshal.h"
 
-ACE_RCSID(DynamicAny, DynUnion_i, "$Id$")
 
-// Constructors and destructor.
+ACE_RCSID (DynamicAny,
+           DynUnion_i,
+           "$Id$")
+
 
 TAO_DynUnion_i::TAO_DynUnion_i (void)
 {
@@ -30,7 +29,7 @@ TAO_DynUnion_i::init_common (void)
 }
 
 void
-TAO_DynUnion_i::init (const CORBA_Any& any
+TAO_DynUnion_i::init (const CORBA::Any& any
                       ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
@@ -58,7 +57,7 @@ TAO_DynUnion_i::init (const CORBA_Any& any
 }
 
 void
-TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc
+TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
                       ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -136,7 +135,7 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
 // This code is common to from_any() and the init() overload that takes
 // an Any argument.
 void
-TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
+TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
                               CORBA::Boolean from_factory
                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -153,10 +152,10 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA_TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA_Any disc_any (disc_tc.in (),
+  CORBA::Any disc_any (disc_tc.in (),
                       0,
                       cdr.byte_order (),
                       cdr.start ());
@@ -188,7 +187,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
   // Get the index.
   for (i = 0; i < count; ++i)
     {
-      CORBA_Any_var label_any = tc->member_label (i
+      CORBA::Any_var label_any = tc->member_label (i
                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -216,7 +215,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA_Any member_any (member_tc.in (),
+      CORBA::Any member_any (member_tc.in (),
                             0,
                             cdr.byte_order (),
                             cdr.start ());
@@ -262,7 +261,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
                                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA_Any default_any (default_tc.in (),
+          CORBA::Any default_any (default_tc.in (),
                                  0,
                                  cdr.byte_order (),
                                  cdr.start ());
@@ -328,13 +327,13 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
     }
 
-  CORBA_Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA_Any_var label_any;
+  CORBA::Any_var label_any;
   CORBA::ULong i;
 
   // member_label() does not work with aliased type codes.
@@ -570,7 +569,7 @@ TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA_TypeCode_var tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
@@ -666,7 +665,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA_TypeCode_var tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
@@ -679,7 +678,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 void
-TAO_DynUnion_i::from_any (const CORBA_Any& any
+TAO_DynUnion_i::from_any (const CORBA::Any& any
                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -734,10 +733,10 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA_TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var disc_any = this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var disc_any = this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *disc_mb = disc_any->_tao_get_cdr ();
@@ -753,10 +752,10 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   // Add the member to the CDR stream.
 
-  CORBA_TypeCode_var member_tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var member_tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var member_any = this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var member_any = this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *member_mb = member_any->_tao_get_cdr ();
@@ -773,9 +772,9 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   // Make the Any.
   TAO_InputCDR in_cdr (out_cdr);
 
-  CORBA_Any_ptr retval = 0;
+  CORBA::Any_ptr retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type_.in (),
+                    CORBA::Any (this->type_.in (),
                                0,
                                in_cdr.byte_order (),
                                in_cdr.start ()),
@@ -901,8 +900,8 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynUnion_i::label_match (const CORBA_Any &my_any,
-                             const CORBA_Any &other_any
+TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
+                             const CORBA::Any &other_any
                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index b5f5e412fd4..c5038b1bf9a 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -50,10 +50,10 @@ public:
   ~TAO_DynUnion_i (void);
   // Destructor.
 
-  void init (const CORBA_Any& any ACE_ENV_ARG_DECL);
+  void init (const CORBA::Any& any ACE_ENV_ARG_DECL);
   // Constructor taking an Any argument.
 
-  void init (CORBA_TypeCode_ptr tc ACE_ENV_ARG_DECL);
+  void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL);
   // Constructor taking a typecode argument.
 
   // = LocalObject methods.
@@ -180,7 +180,7 @@ public:
 private:
   // Code common to the constructor from an Any arg and the member
   // function from_any().
-  void set_from_any (const CORBA_Any &any,
+  void set_from_any (const CORBA::Any &any,
                      CORBA::Boolean from_factory
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
@@ -193,8 +193,8 @@ private:
   void init_common (void);
 
   // Iterative check for label value match.
-  CORBA::Boolean label_match (const CORBA_Any &my_any,
-                              const CORBA_Any &other_any
+  CORBA::Boolean label_match (const CORBA::Any &my_any,
+                              const CORBA::Any &other_any
                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index da91919ac68..45edae5689b 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -342,7 +342,7 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const
 
 // Default constructor.
 DynamicAny::DynAny::InvalidValue::InvalidValue (void)
-  : CORBA_UserException (
+  : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
         "InvalidValue"
       )
@@ -356,7 +356,7 @@ DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
 
 // Copy constructor.
 DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
-  : CORBA_UserException (
+  : CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -367,7 +367,7 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::Inva
 DynamicAny::DynAny::InvalidValue&
 DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -426,7 +426,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
 
 // Default constructor.
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
-  : CORBA_UserException (
+  : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
         "TypeMismatch"
       )
@@ -440,7 +440,7 @@ DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
 
 // Copy constructor.
 DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
-  : CORBA_UserException (
+  : CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -451,7 +451,7 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::Type
 DynamicAny::DynAny::TypeMismatch&
 DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->UserException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2355,7 +2355,7 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer
 void 
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
     void* target,
-    CORBA_Object *src
+    CORBA::Object *src
     ACE_ENV_ARG_DECL
   )
 {
@@ -2364,7 +2364,7 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
   ACE_CHECK;
 }
 
-CORBA_Object*
+CORBA::Object*
 DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *src) const
 {
   DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, src);
@@ -3665,7 +3665,7 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
 
 // Default constructor.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
-  : CORBA_UserException (
+  : CORBA::UserException (
         "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
         "InconsistentTypeCode"
       )
@@ -3679,7 +3679,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
 
 // Copy constructor.
 DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
-  : CORBA_UserException (
+  : CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -3690,7 +3690,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::D
 DynamicAny::DynAnyFactory::InconsistentTypeCode&
 DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->UserException::operator= (_tao_excp);
   return *this;
 }
 
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 2be2bf31127..8051a77603d 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -145,7 +145,7 @@ TAO_NAMESPACE  DynamicAny
 #define _DYNAMICANY_DYNANY_CH_
   
   class TAO_DynamicAny_Export DynAny
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2134,10 +2134,10 @@ TAO_NAMESPACE  DynamicAny
     
     virtual void _downcast (
         void* target,
-        CORBA_Object *src
+        CORBA::Object *src
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    virtual CORBA_Object* _upcast (void *src) const;
+    virtual CORBA::Object* _upcast (void *src) const;
   };
   
 #endif /* end #if !defined */
@@ -2868,7 +2868,7 @@ TAO_NAMESPACE  DynamicAny
 #define _DYNAMICANY_DYNANYFACTORY_CH_
   
   class TAO_DynamicAny_Export DynAnyFactory
-    : public virtual CORBA_Object
+    : public virtual CORBA::Object
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)