ChangeLogTag:Fri Mar 7 10:43:57 2003 Ossama Othman <ossama@uci.edu>

7 files changed, 370 insertions, 337 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index efc93c8fa1f..4b91a9a3691 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Fri Mar  7 10:43:57 2003  Ossama Othman  <ossama@uci.edu>
+
+	* tao/DynamicInterface/Request.h:
+
+	  Explicitly qualify the TAO_Dynamic_Adapter_Impl friend
+	  declaration with a global scope qualifier in an attempt to work
+	  around a problem where some compilers assume that the friend
+	  declaration refers to a class in the local scope or current
+	  namespace.
+
+	  Moved the CORBA_ORB_RequestSeq class into the CORBA namespace.
+
+	* tao/ORB.h:
+	* tao/ObjectIDList.h:
+	* tao/ObjectIDList.i:
+	* tao/ObjectIDList.cpp:
+	* tao/DynamicInterface/Request.cpp:
+
+	  Neglected to put the CORBA_ORB_ObjectIdList and
+	  CORBA_ORB_RequestSeq types into the CORBA namespace, as was
+	  done with all of the other types in the CORBA namespace.
+
 Fri Mar  7 09:34:06 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * TAO_IDL/be/be_visitor_operation/operation.cpp:
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 123925bdbc5..8d11e801c04 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -459,22 +459,22 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
 }
 
 // Constructor.
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max)
+CORBA::ORB_RequestSeq::ORB_RequestSeq (CORBA::ULong max)
   : TAO_Unbounded_Pseudo_Sequence <CORBA::Request,CORBA::Request_var> (max)
 {
   // No-op.
 }
 
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs)
+CORBA::ORB_RequestSeq::ORB_RequestSeq (const CORBA::ORB_RequestSeq &rhs)
   : TAO_Unbounded_Pseudo_Sequence <CORBA::Request,CORBA::Request_var> (rhs)
 {
   // No-op.
 }
 
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max,
-                                            CORBA::ULong length,
-                                            CORBA::Request **data,
-                                            CORBA::Boolean release)
+CORBA::ORB_RequestSeq::ORB_RequestSeq (CORBA::ULong max,
+                                       CORBA::ULong length,
+                                       CORBA::Request **data,
+                                       CORBA::Boolean release)
   : TAO_Unbounded_Pseudo_Sequence <CORBA::Request,CORBA::Request_var> (max,
                                                                        length,
                                                                        data,
@@ -484,7 +484,7 @@ CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max,
 }
 
 
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (void)
+CORBA::ORB_RequestSeq::ORB_RequestSeq (void)
 {
   // No-op.
 }
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 0093bc94e85..2c0ebc24d85 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -1,24 +1,18 @@
 // -*- C++ -*-
-//
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Invocation Interface "Request"
-//    type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Request.h
+ *
+ *  $Id$
+ *
+ *  Header file for CORBA's Dynamic Invocation Interface "Request"
+ *  type.
+ *
+ *  @author Copyright 1994-1995 by Sun Microsystems, Inc.
+ *  @author Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
 
 #ifndef TAO_REQUEST_H
 #define TAO_REQUEST_H
@@ -45,88 +39,108 @@
 
 namespace CORBA
 {
+  /**
+   * @class Request
+   *
+   * @brief CORBA::Request
+   *
+   * Provides a way to create requests and populate it with parameters
+   * for use in the Dynamic Invocation Interface.
+   */
   class TAO_DynamicInterface_Export Request
   {
-    // = TITLE
-    //    CORBA::Request
-    //
-    // = DESCRIPTION
-    //    Provides a way to create requests and populate it with parameters for
-    //    use in the Dynamic Invocation Interface.
-    //
   public:
+
+    /// Return the target of this request.
     CORBA::Object_ptr target (void) const;
-    // Return the target of this request.
 
+    /// Return the operation name for the request.
     const CORBA::Char *operation (void) const;
-    // Return the operation name for the request.
 
+    /// Return the arguments for the request.
     CORBA::NVList_ptr arguments (void);
-    // Return the arguments for the request.
 
+    /// Return the result for the request.
     CORBA::NamedValue_ptr result (void);
-    // Return the result for the request.
 
+    /// Return the exceptions resulting from this request.
     CORBA::ExceptionList_ptr exceptions (void);
-    // Return the exceptions resulting from this request.
 
+    /// Accessor for the Context member.
     CORBA::Context_ptr ctx (void) const;
-    // Accessor for the Context member.
 
+    /// Mutator for the Context member.
     void ctx (CORBA::Context_ptr);
-    // Mutator for the Context member.
 
+    /// Return a list of the request's result's contexts.  Since TAO
+    /// does not implement Contexts, this will always be 0.
     CORBA::ContextList_ptr contexts (void);
-    // Return a list of the request's result's contexts. Since
-    // TAO does not implement Contexts, this will always be 0.
 
+    // @deprecated  Return the <Environment> for this request.
     // CORBA::Environment_ptr env (void);
-    // *** DEPRECATED ***  Return the <Environment> for this request.
 
-    // Argument manipulation helper functions.
 
-    // Arg adders, one for each type of parameter,
-    // with and without optional name. Returns
-    // reference to Any for insertion using <<=.
+    /**
+     * @name Argument manipulation helper functions.
+     *
+     * Arg adders, one for each type of parameter, with and without
+     * optional name. Returns reference to Any for insertion using
+     * <<=.
+     */
+    //@{
     CORBA::Any &add_in_arg (void);
     CORBA::Any &add_in_arg (const char* name);
     CORBA::Any &add_inout_arg (void);
     CORBA::Any &add_inout_arg (const char* name);
     CORBA::Any &add_out_arg (void);
     CORBA::Any &add_out_arg (const char* name);
+    //@}
 
+    /// Initialize the return type.
     void set_return_type (CORBA::TypeCode_ptr tc);
-    // Initialize the return type.
 
+    /// Returns reference to Any for extraction using >>=.
     CORBA::Any &return_value (void);
-    // Returns reference to Any for extraction using >>=.
 
+    /// Perform method resolution and invoke an appropriate method.
+    /**
+     * If the method returns successfully, its result is placed in
+     * the result argument specified on @c create_request. The behavior
+     * is undefined if this @c Request has already been used with a
+     * previous call to @c invoke>, @c send>, or
+     * @send_multiple_requests.
+     *
+     * @note A default argument is set, but please note that this not
+     *       recommended as the user may not be able to propagate the
+     *       exceptions.
+     */
     void invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    // Perform method resolution and invoke an appropriate method. If
-    // the method returns successfully, its result is placed in the
-    // result argument specified on <create_request>. The behavior is
-    // undefined if this <Request> has already been used with a previous
-    // call to <invoke>, <send>, or <send_multiple_requests>.
-
-    // A default argument is set, but please note that this not recommended
-    // as the user may not be able to propagate the exceptions
 
+    /// Send a oneway request.
+    /**
+     * @note A default argument is set, but please note that this not
+     *       recommended as the user may not be able to propagate the
+     *       exceptions.
+     */
     void send_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    // Send a oneway request.
-    // A default argument is set, but please note that this not recommended
-    // as the user may not be able to propagate the exceptions.
 
-    // The 'deferred synchronous' methods.
+    /**
+     * @name The 'deferred synchronous' methods.
+     *
+     * The 'deferred synchronous' methods.
+     */
+    //@{
     void send_deferred (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
     void get_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
     CORBA::Boolean poll_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    //@}
 
-    // Callback method for deferred synchronous requests.
+    /// Callback method for deferred synchronous requests.
     void handle_response (TAO_InputCDR &incoming,
                           CORBA::ULong reply_status
                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    // Pseudo object methods.
+    /// Pseudo object methods.
     static CORBA::Request* _duplicate (CORBA::Request*);
     static CORBA::Request* _nil (void);
 
@@ -134,21 +148,21 @@ namespace CORBA
     CORBA::ULong _incr_refcnt (void);
     CORBA::ULong _decr_refcnt (void);
 
+    /// Set the lazy evaluation flag.
     void _tao_lazy_evaluation (int lazy_evaluation);
-    // Set the lazy evaluation flag.
 
+    /// Get the byte order member.
     int _tao_byte_order (void) const;
-    // Get the byte order member.
 
+    /// Set the byte order member.
     void _tao_byte_order (int byte_order);
-    // Set the byte order member.
 
+    // Hold on to a user exception in case we are part of a TAO
+    // gateway.
     void raw_user_exception (TAO_InputCDR &cdr);
-    // Hold on to a user exception in case we are part of
-    // a TAO gateway.
 
+    /// Accessor for the input stream containing the exception.
     ACE_CString &raw_user_exception (void);
-    // Accessor for the input stream containing the exception.
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     // Useful for template programming.
@@ -157,7 +171,7 @@ namespace CORBA
 #endif /* __GNUC__ */
 
   private:
-    friend class TAO_Dynamic_Adapter_Impl;
+    friend class ::TAO_Dynamic_Adapter_Impl;
 
     // The following are not allowed except when called from the
     // friend class.
@@ -178,71 +192,69 @@ namespace CORBA
 
     ~Request (void);
 
+  private:
+
+    /// Target object.
     CORBA::Object_ptr target_;
-    // Target object.
 
+    /// Pointer to our ORB.
     CORBA::ORB_var orb_;
-    // Pointer to our ORB.
 
-    const CORBA::Char *opname_;
-    // Operation name.
+    /// Operation name.
+    const char * opname_;
 
+    /// Parameter list.
     CORBA::NVList_ptr args_;
-    // Parameter list.
 
+    /// Result of the operation.
     CORBA::NamedValue_ptr result_;
-    // Result of the operation.
 
+    /// Invocation flags.
     CORBA::Flags flags_;
-    // Invocation flags.
 
+    /// @deprecated  Holds exceptions.
     // CORBA::Environment env_;
-    // *** DEPRECATED ***  Holds exceptions.
 
+    /// List of exceptions raised by the operation.
     CORBA::ExceptionList_var exceptions_;
-    // List of exceptions raised by the operation.
 
+    /// List of the request's result's contexts.
     CORBA::ContextList_ptr contexts_;
-    // List of the request's result's contexts.
 
+    /// Context associated with this request.
     CORBA::Context_ptr ctx_;
-    // Context associated with this request.
 
+    /// Reference counting.
     CORBA::ULong refcount_;
-    // Reference counting.
 
+    /// Protect the refcount_ and response_receieved_.
     TAO_SYNCH_MUTEX lock_;
-    // Protect the refcount_ and response_receieved_.
 
+    /// If not zero then the NVList is not evaluated by default.
     int lazy_evaluation_;
-    // If not zero then the NVList is not evaluated by default.
 
+    /// Set to TRUE upon completion of invoke() or handle_response().
     CORBA::Boolean response_received_;
-    // Set to TRUE upon completion of invoke() or
-    // handle_response().
 
+    /// Can be reset by a gateway when passing along a request.
     int byte_order_;
-    // Can be reset by a gateway when passing along a request.
 
+    /// Stores user exception as a CDR stream when this request is
+    /// used in a TAO gateway.
     ACE_CString raw_user_exception_;
-    // Stores user exception as a CDR stream when this request is
-    // used in a TAO gateway.
+
   };
 
+  /**
+   * @class Request_var
+   *
+   * @brief The T_var class for Request.
+   *
+   * As any other pseudo object Request must have a T_var class, the
+   * interface an semantics are specified in the CORBA spec.
+   */
   class TAO_DynamicInterface_Export Request_var
   {
-    // = TITLE
-    //    The T_var class for Request.
-    //
-    // = DESCRIPTION
-    //    As any other pseudo object Request must have a T_var class,
-    //    the interface an semantics are specified in the CORBA spec.
-    //
-    // = NOTE
-    //    We use CORBA::Request_ptr as the _ptr type instead of
-    //    CORBA::Request_ptr, this is an attempt to reduced the cyclic
-    //    dependencies in TAO.
-    //
   public:
     Request_var (void);
     Request_var (Request_ptr);
@@ -267,20 +279,16 @@ namespace CORBA
     Request_ptr ptr_;
   };
 
+  /**
+   * @class Request_out
+   *
+   * @brief The T_out class for Request
+   *
+   * As any other pseudo object Request must have a T_out class, the
+   * interface an semantics are specified in the CORBA spec.
+   */
   class TAO_DynamicInterface_Export Request_out
   {
-    // = TITLE
-    //    The T_out class for Request
-    //
-    // = DESCRIPTION
-    //    As any other pseudo object Request must have a T_out class,
-    //    the interface an semantics are specified in the CORBA spec.
-    //
-    // = NOTE
-    //    We use Request_ptr as the _ptr type instead of
-    //    CORBA::Request_ptr, this is an attempt to reduced the cyclic
-    //    dependencies in TAO.
-    //
   public:
     Request_out (Request_ptr &);
     Request_out (Request_var &);
@@ -295,92 +303,94 @@ namespace CORBA
   private:
     Request_ptr &ptr_;
   };
-} // End CORBA namespace.
 
   // Make sure you instantiate this in Request.cpp
-class TAO_DynamicInterface_Export CORBA_ORB_RequestSeq
-  : public TAO_Unbounded_Pseudo_Sequence<CORBA::Request, CORBA::Request_var>
-{
-public:
-  // Helpful with template programming.
+  class TAO_DynamicInterface_Export ORB_RequestSeq
+    : public TAO_Unbounded_Pseudo_Sequence<CORBA::Request, CORBA::Request_var>
+  {
+  public:
+    // Helpful with template programming.
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ORB_RequestSeq_var _var_type;
+    typedef ORB_RequestSeq_var _var_type;
 #endif /* __GNUC__ */
 
-  // Implement the same constructors provided by the template here,
-  // check Sequence_T.h for ideas.
-  // Simply delegate on the template for the implementation...
+    // Implement the same constructors provided by the template here,
+    // check Sequence_T.h for ideas.
+    // Simply delegate on the template for the implementation...
 
-  CORBA_ORB_RequestSeq (void);
-  // Default constructor.
+    /// Default constructor.
+    ORB_RequestSeq (void);
 
-  CORBA_ORB_RequestSeq (CORBA::ULong max);
-  // Constructor with a "hint" for the maximum capacity.
+    /// Constructor with a "hint" for the maximum capacity.
+    ORB_RequestSeq (CORBA::ULong max);
 
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                        CORBA::ULong length,
-                        CORBA::Request* * data,
-                        CORBA::Boolean release=0);
-  // Constructor with a given buffer.
+    /// Constructor with a given buffer.
+    ORB_RequestSeq (CORBA::ULong maximum,
+                    CORBA::ULong length,
+                    CORBA::Request* * data,
+                    CORBA::Boolean release=0);
 
-  CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &);
-  // Copy ctor, deep copies.
-};
+    /// Copy ctor, deep copies.
+    ORB_RequestSeq (const ORB_RequestSeq &);
 
-class TAO_DynamicInterface_Export CORBA_ORB_RequestSeq_var
-{
-public:
-  CORBA_ORB_RequestSeq_var (void);
-  // Default constructor.
+  };
 
-  CORBA_ORB_RequestSeq_var (CORBA_ORB_RequestSeq *);
+  class TAO_DynamicInterface_Export ORB_RequestSeq_var
+  {
+  public:
+    /// Default constructor.
+    ORB_RequestSeq_var (void);
 
-  CORBA_ORB_RequestSeq_var (const CORBA_ORB_RequestSeq_var &);
-  // Copy constructor.
+    ORB_RequestSeq_var (ORB_RequestSeq *);
 
-  ~CORBA_ORB_RequestSeq_var (void);
-  // Destructor.
+    /// Copy constructor.
+    ORB_RequestSeq_var (const ORB_RequestSeq_var &);
 
-  CORBA_ORB_RequestSeq_var &operator= (CORBA_ORB_RequestSeq *);
-  CORBA_ORB_RequestSeq_var &operator= (const CORBA_ORB_RequestSeq_var &);
-  CORBA_ORB_RequestSeq *operator-> (void);
-  const CORBA_ORB_RequestSeq *operator-> (void) const;
+    /// Destructor.
+    ~ORB_RequestSeq_var (void);
 
-  operator const CORBA_ORB_RequestSeq &() const;
-  operator CORBA_ORB_RequestSeq &();
-  operator CORBA_ORB_RequestSeq &() const;
-  CORBA::Octet &operator[] (CORBA::ULong slot);
+    ORB_RequestSeq_var &operator= (ORB_RequestSeq *);
+    ORB_RequestSeq_var &operator= (const ORB_RequestSeq_var &);
+    ORB_RequestSeq *operator-> (void);
+    const ORB_RequestSeq *operator-> (void) const;
 
-  // in, inout, out, _retn.
-  const CORBA_ORB_RequestSeq &in (void) const;
-  CORBA_ORB_RequestSeq &inout (void);
-  CORBA_ORB_RequestSeq *&out (void);
-  CORBA_ORB_RequestSeq *_retn (void);
-  CORBA_ORB_RequestSeq *ptr (void) const;
+    operator const ORB_RequestSeq &() const;
+    operator ORB_RequestSeq &();
+    operator ORB_RequestSeq &() const;
+    CORBA::Octet &operator[] (CORBA::ULong slot);
 
-private:
-  CORBA_ORB_RequestSeq *ptr_;
-};
+    // in, inout, out, _retn.
+    const ORB_RequestSeq &in (void) const;
+    ORB_RequestSeq &inout (void);
+    ORB_RequestSeq *&out (void);
+    ORB_RequestSeq *_retn (void);
+    ORB_RequestSeq *ptr (void) const;
 
-class TAO_DynamicInterface_Export CORBA_ORB_RequestSeq_out
-{
-public:
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq *&);
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_var &);
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_out &);
-  CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq_out &);
-  CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq *);
-  operator CORBA_ORB_RequestSeq *&();
-  CORBA_ORB_RequestSeq *&ptr (void);
-  CORBA_ORB_RequestSeq *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_ORB_RequestSeq *&ptr_;
-
-  // Assignment from T_var not allowed.
-  void operator= (const CORBA_ORB_RequestSeq_var &);
-};
+  private:
+    ORB_RequestSeq *ptr_;
+  };
+
+  class TAO_DynamicInterface_Export ORB_RequestSeq_out
+  {
+  public:
+    ORB_RequestSeq_out (ORB_RequestSeq *&);
+    ORB_RequestSeq_out (ORB_RequestSeq_var &);
+    ORB_RequestSeq_out (ORB_RequestSeq_out &);
+    ORB_RequestSeq_out &operator= (ORB_RequestSeq_out &);
+    ORB_RequestSeq_out &operator= (ORB_RequestSeq *);
+    operator ORB_RequestSeq *&();
+    ORB_RequestSeq *&ptr (void);
+    ORB_RequestSeq *operator-> (void);
+    CORBA::Octet &operator[] (CORBA::ULong slot);
+
+  private:
+    ORB_RequestSeq *&ptr_;
+
+    /// Assignment from T_var not allowed.
+    void operator= (const ORB_RequestSeq_var &);
+  };
+
+} // End CORBA namespace.
 
 #if defined (__ACE_INLINE__)
 # include "Request.inl"
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 3bdf0d83aa5..f9b1e992ac7 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -32,6 +32,8 @@
 // IRIX needs this for the throw specs
 #include "PolicyC.h"
 
+#include "ace/Synch.h"
+
 typedef enum
 {
   TAO_SERVICEID_NAMESERVICE,
@@ -53,23 +55,19 @@ class TAO_Stub;
 class TAO_Acceptor_Filter;
 class TAO_ValueFactory_Map;
 
-class CORBA_ORB_ObjectIdList;
-class CORBA_ORB_ObjectIdList_var;
-class CORBA_ORB_ObjectIdList_out;
-
-class CORBA_ORB_ObjectIdList;
-class CORBA_ORB_ObjectIdList_var;
-class CORBA_ORB_ObjectIdList_out;
-
-class CORBA_ORB_RequestSeq;
-class CORBA_ORB_RequestSeq_var;
-class CORBA_ORB_RequestSeq_out;
-
 
 // ****************************************************************
 
 namespace CORBA
 {
+  class ORB_ObjectIdList;
+  class ORB_ObjectIdList_var;
+  class ORB_ObjectIdList_out;
+
+  class ORB_RequestSeq;
+  class ORB_RequestSeq_var;
+  class ORB_RequestSeq_out;
+
   /**
    * @class ORB
    *
@@ -114,10 +112,10 @@ namespace CORBA
     typedef CORBA::String_out ObjectId_out;
     static CORBA::TypeCode_ptr _tc_ObjectId;
 
-    typedef CORBA_ORB_ObjectIdList ObjectIdList;
-    typedef CORBA_ORB_ObjectIdList_var ObjectIdList_var;
-    typedef CORBA_ORB_ObjectIdList_out ObjectIdList_out;
-    typedef CORBA_ORB_ObjectIdList *ObjectIdList_ptr;
+    typedef CORBA::ORB_ObjectIdList ObjectIdList;
+    typedef CORBA::ORB_ObjectIdList_var ObjectIdList_var;
+    typedef CORBA::ORB_ObjectIdList_out ObjectIdList_out;
+    typedef CORBA::ORB_ObjectIdList *ObjectIdList_ptr;
     static CORBA::TypeCode_ptr _tc_ObjectIdList;
 
     /// Return a duplicate of @c orb.
@@ -168,9 +166,9 @@ namespace CORBA
     // Typedefs for CORBA::ORB::RequestSeq, which is an argument of
     // send_multiple_requests_*().  See Request.{h,i,cpp} for
     // definitions.
-    typedef CORBA_ORB_RequestSeq RequestSeq;
-    typedef CORBA_ORB_RequestSeq_var RequestSeq_var;
-    typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
+    typedef CORBA::ORB_RequestSeq RequestSeq;
+    typedef CORBA::ORB_RequestSeq_var RequestSeq_var;
+    typedef CORBA::ORB_RequestSeq_out RequestSeq_out;
 
     void create_list (CORBA::Long count,
                       CORBA::NVList_ptr &new_list
@@ -199,10 +197,10 @@ namespace CORBA
       CORBA::ServiceInformation_out service_information
       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &req
+    void send_multiple_requests_oneway (const CORBA::ORB::RequestSeq &req
                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-    void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &req
+    void send_multiple_requests_deferred (const CORBA::ORB::RequestSeq &req
                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     void get_next_response (CORBA::Request_ptr &req
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
index 83732dce984..316ba624a6b 100644
--- a/TAO/tao/ObjectIDList.cpp
+++ b/TAO/tao/ObjectIDList.cpp
@@ -23,12 +23,12 @@
 #define _CORBA_ORB_OBJECTIDLIST_CS_
 
 // *************************************************************
-// CORBA_ORB_ObjectIdList
+// CORBA::ORB_ObjectIdList
 // *************************************************************
 
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (void)
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void)
 {}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max) // uses max size
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max) // uses max size
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
@@ -37,7 +37,7 @@ CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max) // uses max si
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
@@ -46,7 +46,7 @@ CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong l
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &seq) // copy ctor
+CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const CORBA::ORB_ObjectIdList &seq) // copy ctor
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
@@ -55,7 +55,7 @@ CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &se
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
-CORBA_ORB_ObjectIdList::~CORBA_ORB_ObjectIdList (void) // dtor
+CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) // dtor
 {}
 
 
@@ -78,12 +78,12 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
       0, // string length
   0,
 };
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (CORBA::tk_alias, sizeof (_oc_CORBA_ORB_ObjectIdList), (char *) &_oc_CORBA_ORB_ObjectIdList, 0, sizeof (CORBA_ORB_ObjectIdList));
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (CORBA::tk_alias, sizeof (_oc_CORBA_ORB_ObjectIdList), (char *) &_oc_CORBA_ORB_ObjectIdList, 0, sizeof (CORBA::ORB_ObjectIdList));
 CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA_ORB_ObjectIdList &_tao_elem
+    const CORBA::ORB_ObjectIdList &_tao_elem
   ) // copying
 {
     TAO_OutputCDR stream;
@@ -97,7 +97,7 @@ void operator<<= (
 CORBA::Boolean
 operator<< (
     TAO_OutputCDR &strm,
-    const CORBA_ORB_ObjectIdList &_tao_sequence
+    const CORBA::ORB_ObjectIdList &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -112,7 +112,7 @@ operator<< (
 }
 
 CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
+operator>> (TAO_InputCDR &strm, CORBA::ORB_ObjectIdList &_tao_sequence)
 {
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
@@ -128,13 +128,13 @@ operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
   return 0; // error
 }
 
-void CORBA_ORB_ObjectIdList::_tao_any_destructor (void *x)
+void CORBA::ORB_ObjectIdList::_tao_any_destructor (void *x)
 {
-  CORBA_ORB_ObjectIdList *tmp = ACE_static_cast(CORBA_ORB_ObjectIdList*,x);
+  CORBA::ORB_ObjectIdList *tmp = ACE_static_cast (CORBA::ORB_ObjectIdList*, x);
   delete tmp;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *_tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA::ORB_ObjectIdList *_tao_elem)
 {
     TAO_OutputCDR stream;
     stream << *_tao_elem;
@@ -144,10 +144,10 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *_tao_elem)
                            stream.begin (),
                            1,
                            _tao_elem,
-                           CORBA_ORB_ObjectIdList::_tao_any_destructor);
+                           CORBA::ORB_ObjectIdList::_tao_any_destructor);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ORB_ObjectIdList *&_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
@@ -156,12 +156,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
-      _tao_elem = (CORBA_ORB_ObjectIdList *)_tao_any.value ();
+      _tao_elem = (CORBA::ORB_ObjectIdList *)_tao_any.value ();
       return 1;
     }
     else
     {
-      ACE_NEW_RETURN (_tao_elem, CORBA_ORB_ObjectIdList, 0);
+      ACE_NEW_RETURN (_tao_elem, CORBA::ORB_ObjectIdList, 0);
       TAO_InputCDR stream (_tao_any._tao_get_cdr (),
                            _tao_any._tao_byte_order ());
       if (stream >> *_tao_elem)
@@ -170,7 +170,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *
             CORBA::ORB::_tc_ObjectIdList,
             1,
             _tao_elem,
-            CORBA_ORB_ObjectIdList::_tao_any_destructor);
+            CORBA::ORB_ObjectIdList::_tao_any_destructor);
         return 1;
       }
       else
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
index 164e6597093..e66b35067bf 100644
--- a/TAO/tao/ObjectIDList.h
+++ b/TAO/tao/ObjectIDList.h
@@ -41,66 +41,68 @@
 // ObjectIdList
 // *************************************************************
 
-class TAO_Export CORBA_ORB_ObjectIdList : public
+namespace CORBA
+{
+  class TAO_Export ORB_ObjectIdList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-{
-public:
- CORBA_ORB_ObjectIdList (void); // default ctor
- CORBA_ORB_ObjectIdList (CORBA::ULong max); // uses max size
- CORBA_ORB_ObjectIdList (
-               CORBA::ULong max,
-               CORBA::ULong length,
-               char * *buffer,
-               CORBA::Boolean release=0
-               );
- CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &); // copy ctor
- ~CORBA_ORB_ObjectIdList (void); // dtor
-
-  static void _tao_any_destructor (void*);
-};
-
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
+  {
+  public:
+    ORB_ObjectIdList (void); // default ctor
+    ORB_ObjectIdList (CORBA::ULong max); // uses max size
+    ORB_ObjectIdList (
+                            CORBA::ULong max,
+                            CORBA::ULong length,
+                            char * *buffer,
+                            CORBA::Boolean release=0
+                            );
+    ORB_ObjectIdList (const ORB_ObjectIdList &); // copy ctor
+    ~ORB_ObjectIdList (void); // dtor
+
+    static void _tao_any_destructor (void*);
+  };
+
+  typedef ORB_ObjectIdList *ORB_ObjectIdList_ptr;
 
 #endif /* end #if !defined */
 
 #if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
 #define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
 
-// *************************************************************
-// class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-class TAO_Export CORBA_ORB_ObjectIdList_var
-{
-public:
-  CORBA_ORB_ObjectIdList_var (void); // default constructor
-  CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &); // copy constructor
-  ~CORBA_ORB_ObjectIdList_var (void); // destructor
-
-  CORBA_ORB_ObjectIdList_var &operator= (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var &operator= (const CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  const CORBA_ORB_ObjectIdList *operator-> (void) const;
-
-  operator const CORBA_ORB_ObjectIdList &() const;
-  operator CORBA_ORB_ObjectIdList &();
-  operator CORBA_ORB_ObjectIdList &() const;
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_ORB_ObjectIdList &in (void) const;
-  CORBA_ORB_ObjectIdList &inout (void);
-  CORBA_ORB_ObjectIdList *&out (void);
-  CORBA_ORB_ObjectIdList *_retn (void);
-  CORBA_ORB_ObjectIdList *ptr (void) const;
-
-private:
-  CORBA_ORB_ObjectIdList *ptr_;
-};
+  // *************************************************************
+  // class CORBA::ORB::ObjectIdList_var
+  // *************************************************************
+
+  class TAO_Export ORB_ObjectIdList_var
+  {
+  public:
+    ORB_ObjectIdList_var (void); // default constructor
+    ORB_ObjectIdList_var (ORB_ObjectIdList *);
+    ORB_ObjectIdList_var (const ORB_ObjectIdList_var &); // copy constructor
+    ~ORB_ObjectIdList_var (void); // destructor
+
+    ORB_ObjectIdList_var &operator= (ORB_ObjectIdList *);
+    ORB_ObjectIdList_var &operator= (const ORB_ObjectIdList_var &);
+    ORB_ObjectIdList *operator-> (void);
+    const ORB_ObjectIdList *operator-> (void) const;
+
+    operator const ORB_ObjectIdList &() const;
+    operator ORB_ObjectIdList &();
+    operator ORB_ObjectIdList &() const;
+    TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
+    // in, inout, out, _retn
+    const ORB_ObjectIdList &in (void) const;
+    ORB_ObjectIdList &inout (void);
+    ORB_ObjectIdList *&out (void);
+    ORB_ObjectIdList *_retn (void);
+    ORB_ObjectIdList *ptr (void) const;
+
+  private:
+    ORB_ObjectIdList *ptr_;
+  };
 
 #endif /* end #if !defined */
 
@@ -108,29 +110,30 @@ private:
 #if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
 #define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
 
-class TAO_Export CORBA_ORB_ObjectIdList_out
-{
-public:
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&);
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (CORBA_ORB_ObjectIdList *);
-  operator CORBA_ORB_ObjectIdList *&();
-  CORBA_ORB_ObjectIdList *&ptr (void);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_ORB_ObjectIdList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ORB_ObjectIdList_var &);
-};
+  class TAO_Export ORB_ObjectIdList_out
+  {
+  public:
+    ORB_ObjectIdList_out (ORB_ObjectIdList *&);
+    ORB_ObjectIdList_out (ORB_ObjectIdList_var &);
+    ORB_ObjectIdList_out (const ORB_ObjectIdList_out &);
+    ORB_ObjectIdList_out &operator= (const ORB_ObjectIdList_out &);
+    ORB_ObjectIdList_out &operator= (ORB_ObjectIdList *);
+    operator ORB_ObjectIdList *&();
+    ORB_ObjectIdList *&ptr (void);
+    ORB_ObjectIdList *operator-> (void);
+    TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
+
+  private:
+    ORB_ObjectIdList *&ptr_;
+    // assignment from T_var not allowed
+    void operator= (const ORB_ObjectIdList_var &);
+  };
 
 #endif /* end #if !defined */
+}  // End CORBA namespace.
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ORB_ObjectIdList &); //
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ORB_ObjectIdList &); //
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ORB_ObjectIdList &);
 
 #if defined (__ACE_INLINE__)
 #include "tao/ObjectIDList.i"
diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i
index 29c465f6a6f..c76fcaeaccd 100644
--- a/TAO/tao/ObjectIDList.i
+++ b/TAO/tao/ObjectIDList.i
@@ -19,133 +19,133 @@
 // *************************************************************
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (void) // default constructor
+CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *p)
+CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (CORBA::ORB_ObjectIdList *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &p) // copy constructor
+CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (const CORBA::ORB_ObjectIdList_var &p) // copy constructor
 {
   if (p.ptr_)
-    this->ptr_ = new CORBA_ORB_ObjectIdList(*p.ptr_);
+    this->ptr_ = new CORBA::ORB_ObjectIdList(*p.ptr_);
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::~CORBA_ORB_ObjectIdList_var (void) // destructor
+CORBA::ORB_ObjectIdList_var::~ORB_ObjectIdList_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (CORBA_ORB_ObjectIdList *p)
+ACE_INLINE CORBA::ORB_ObjectIdList_var &
+CORBA::ORB_ObjectIdList_var::operator= (CORBA::ORB_ObjectIdList *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (const CORBA_ORB_ObjectIdList_var &p) // deep copy
+ACE_INLINE CORBA::ORB_ObjectIdList_var &
+CORBA::ORB_ObjectIdList_var::operator= (const CORBA::ORB_ObjectIdList_var &p) // deep copy
 {
   if (this != &p)
   {
     delete this->ptr_;
-    this->ptr_ = new CORBA_ORB_ObjectIdList (*p.ptr_);
+    this->ptr_ = new CORBA::ORB_ObjectIdList (*p.ptr_);
   }
   return *this;
 }
 
-ACE_INLINE const CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void) const
+ACE_INLINE const CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void)
+ACE_INLINE CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator const CORBA_ORB_ObjectIdList &() const // cast
+CORBA::ORB_ObjectIdList_var::operator const CORBA::ORB_ObjectIdList &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() // cast
+CORBA::ORB_ObjectIdList_var::operator CORBA::ORB_ObjectIdList &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() const// cast
+CORBA::ORB_ObjectIdList_var::operator CORBA::ORB_ObjectIdList &() const// cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_var::operator[] (CORBA::ULong slot)
+CORBA::ORB_ObjectIdList_var::operator[] (CORBA::ULong slot)
 {
   return this->ptr_->operator[] (slot);
 }
 
-ACE_INLINE const CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::in (void) const
+ACE_INLINE const CORBA::ORB_ObjectIdList &
+CORBA::ORB_ObjectIdList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::inout (void)
+ACE_INLINE CORBA::ORB_ObjectIdList &
+CORBA::ORB_ObjectIdList_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_var::out (void)
+ACE_INLINE CORBA::ORB_ObjectIdList *&
+CORBA::ORB_ObjectIdList_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::_retn (void)
+ACE_INLINE CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::_retn (void)
 {
-  CORBA_ORB_ObjectIdList *tmp = this->ptr_;
+  CORBA::ORB_ObjectIdList *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::ptr (void) const
+ACE_INLINE CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ORB_ObjectIdList_out
+// Inline operations for class CORBA::ORB_ObjectIdList_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&p)
+CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (CORBA::ORB_ObjectIdList *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &p) // constructor from _var
+CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (CORBA::ORB_ObjectIdList_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -153,44 +153,44 @@ CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_v
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_)
+CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (const CORBA::ORB_ObjectIdList_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA::ORB_ObjectIdList_out&,p).ptr_)
 {}
 
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (const CORBA_ORB_ObjectIdList_out &p)
+ACE_INLINE CORBA::ORB_ObjectIdList_out &
+CORBA::ORB_ObjectIdList_out::operator= (const CORBA::ORB_ObjectIdList_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA::ORB_ObjectIdList_out&,p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (CORBA_ORB_ObjectIdList *p)
+ACE_INLINE CORBA::ORB_ObjectIdList_out &
+CORBA::ORB_ObjectIdList_out::operator= (CORBA::ORB_ObjectIdList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE
-CORBA_ORB_ObjectIdList_out::operator CORBA_ORB_ObjectIdList *&() // cast
+CORBA::ORB_ObjectIdList_out::operator CORBA::ORB_ObjectIdList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_out::ptr (void) // ptr
+ACE_INLINE CORBA::ORB_ObjectIdList *&
+CORBA::ORB_ObjectIdList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_out::operator-> (void)
+ACE_INLINE CORBA::ORB_ObjectIdList *
+CORBA::ORB_ObjectIdList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong slot)
+CORBA::ORB_ObjectIdList_out::operator[] (CORBA::ULong slot)
 {
   return this->ptr_->operator[] (slot);
 }