*** empty log message ***

6 files changed, 126 insertions, 100 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 8a258525639..5f14b543697 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,16 @@
+Wed May 12 08:56:40 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
+
+	* tao/corbafwd.h
+	  tao/ORB.h
+	  tao/ObjectIDList.{h, i, cpp}:
+
+	  Fixed a number of compile errors with the newly added
+	  ObjectIdList class. We now use the same trick that we use for
+	  classes defined in the CORBA namespace. Thus, we define the
+	  ObjectIdList class as CORBA_ORB_ObjectIdList and then typedef it
+	  inside class CORBA_ORB. We needed some forward declarations in
+	  corbafwd.h. 
+
 Wed May 12 02:38:52 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
 	  Code review changes and additions for the CosEC Factory.
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 8283a1417db..e0919ce957c 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -240,6 +240,12 @@ public:
   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;
+  static CORBA::TypeCode_ptr _tc_ObjectIdList;
+
   static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
   // Return a duplicate of <{orb}>.  When work with this duplicate is
   // complete, it should be freed up using <CORBA::release()>.
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
index 1426d77d53d..457dd324377 100644
--- a/TAO/tao/ObjectIDList.cpp
+++ b/TAO/tao/ObjectIDList.cpp
@@ -20,12 +20,12 @@
 #define _CORBA_ORB_OBJECTIDLIST_CS_
 
 // *************************************************************
-// CORBA::ORB::ObjectIdList
+// CORBA_ORB_ObjectIdList
 // *************************************************************
 
-CORBA::ORB::ObjectIdList::ObjectIdList (void)
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (void)
 {}
-CORBA::ORB::ObjectIdList::ObjectIdList (CORBA::ULong max) // uses max size
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
@@ -34,7 +34,7 @@ CORBA::ORB::ObjectIdList::ObjectIdList (CORBA::ULong max) // uses max size
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::ORB::ObjectIdList::ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
@@ -43,7 +43,7 @@ CORBA::ORB::ObjectIdList::ObjectIdList (CORBA::ULong max, CORBA::ULong length, c
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::ORB::ObjectIdList::ObjectIdList (const ObjectIdList &seq) // copy ctor
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
@@ -52,7 +52,7 @@ CORBA::ORB::ObjectIdList::ObjectIdList (const ObjectIdList &seq) // copy ctor
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
-CORBA::ORB::ObjectIdList::~ObjectIdList (void) // dtor
+CORBA_ORB_ObjectIdList::~CORBA_ORB_ObjectIdList (void) // dtor
 {}
 
 
@@ -75,7 +75,7 @@ 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;
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -86,11 +86,11 @@ CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectI
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ORB::ObjectIdList &_tao_elem
+    const CORBA_ORB_ObjectIdList &_tao_elem
   ) // copying
 {
-  CORBA::ORB::ObjectIdList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA::ORB::ObjectIdList (_tao_elem));
+  CORBA_ORB_ObjectIdList *_tao_any_val;
+  ACE_NEW (_tao_any_val, CORBA_ORB_ObjectIdList (_tao_elem));
   if (!_tao_any_val) return;
   ACE_TRY_NEW_ENV
   {
@@ -104,7 +104,7 @@ void operator<<= (
   ACE_ENDTRY;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ORB::ObjectIdList *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *_tao_elem) // non copying
 {
   ACE_TRY_NEW_ENV
   {
@@ -115,7 +115,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ORB::ObjectIdList *_tao_elem) //
   ACE_ENDTRY;
 }
 
-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
   {
@@ -124,12 +124,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 ());
       if (stream.decode (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
index efcf16a5d09..3635a999f5d 100644
--- a/TAO/tao/ObjectIDList.h
+++ b/TAO/tao/ObjectIDList.h
@@ -14,6 +14,8 @@
 #define OBJECTIDLIST_H_
 
 #include "tao/corba.h"
+#include "tao/Sequence.h"
+#include "tao/Sequence_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -36,7 +38,7 @@
 // ObjectIdList
 // *************************************************************
 
-class  CORBA_ORB::ObjectIdList : public 
+class  CORBA_ORB_ObjectIdList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
@@ -44,19 +46,19 @@ TAO_Unbounded_String_Sequence
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 {
 public:
- ObjectIdList (void); // default ctor
- ObjectIdList (CORBA::ULong max); // uses max size
- ObjectIdList (
+ 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
                );
- ObjectIdList (const CORBA_ORB::ObjectIdList &); // copy ctor
- ~ObjectIdList (void); // dtor
+ CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &); // copy ctor
+ ~CORBA_ORB_ObjectIdList (void); // dtor
 };
 
-typedef CORBA_ORB::ObjectIdList *CORBA_ORB::ObjectIdList_ptr;
+typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
 
 #endif /* end #if !defined */
 
@@ -67,32 +69,32 @@ typedef CORBA_ORB::ObjectIdList *CORBA_ORB::ObjectIdList_ptr;
 // class CORBA::ORB::ObjectIdList_var
 // *************************************************************
 
-class CORBA_ORB::ObjectIdList_var
+class CORBA_ORB_ObjectIdList_var
 {
 public:
-  ObjectIdList_var (void); // default constructor
-  ObjectIdList_var (ObjectIdList *);
-  ObjectIdList_var (const ObjectIdList_var &); // copy constructor
-  ~ObjectIdList_var (void); // destructor
+  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
   
-  ObjectIdList_var &operator= (ObjectIdList *);
-  ObjectIdList_var &operator= (const ObjectIdList_var &);
-  ObjectIdList *operator-> (void);
-  const ObjectIdList *operator-> (void) const;
+  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 ObjectIdList &() const;
-  operator ObjectIdList &();
-  operator ObjectIdList &() const;
+  operator const CORBA_ORB_ObjectIdList &() const;
+  operator CORBA_ORB_ObjectIdList &();
+  operator CORBA_ORB_ObjectIdList &() const;
   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
   // in, inout, out, _retn 
-  const ObjectIdList &in (void) const;
-  ObjectIdList &inout (void);
-  ObjectIdList *&out (void);
-  ObjectIdList *_retn (void);
-  ObjectIdList *ptr (void) const;
+  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:
-  ObjectIdList *ptr_;
+  CORBA_ORB_ObjectIdList *ptr_;
 };
 
 #endif /* end #if !defined */
@@ -101,34 +103,34 @@ private:
 #if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
 #define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
 
-class CORBA_ORB::ObjectIdList_out
+class CORBA_ORB_ObjectIdList_out
 {
 public:
-  ObjectIdList_out (ObjectIdList *&);
-  ObjectIdList_out (ObjectIdList_var &);
-  ObjectIdList_out (const ObjectIdList_out &);
-  ObjectIdList_out &operator= (const ObjectIdList_out &);
-  ObjectIdList_out &operator= (ObjectIdList *);
-  operator ObjectIdList *&();
-  ObjectIdList *&ptr (void);
-  ObjectIdList *operator-> (void);
+  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 index);
   
 private:
-  ObjectIdList *&ptr_;
+  CORBA_ORB_ObjectIdList *&ptr_;
   // assignment from T_var not allowed
-  void operator= (const CORBA_ORB::ObjectIdList_var &);
+  void operator= (const CORBA_ORB_ObjectIdList_var &);
 };
 
 #endif /* end #if !defined */
 
-static CORBA::TypeCode_ptr _tc_ObjectIdList;
+static CORBA::TypeCode_ptr _tc_CORBA_ORB_ObjectIdList;
 
 
 #ifndef __ACE_INLINE__
 
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ORB::ObjectIdList &); // 
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ORB::ObjectIdList &);
+CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA::ORB::CORBA_ORB_ObjectIdList &); // 
+CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::ORB::CORBA_ORB_ObjectIdList &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i
index 7b29d9ea628..27a7de43743 100644
--- a/TAO/tao/ObjectIDList.i
+++ b/TAO/tao/ObjectIDList.i
@@ -18,133 +18,133 @@
 // *************************************************************
 
 ACE_INLINE
-CORBA::ORB::ObjectIdList_var::ObjectIdList_var (void) // default constructor
+CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::ORB::ObjectIdList_var::ObjectIdList_var (CORBA::ORB::ObjectIdList *p)
+CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::ORB::ObjectIdList_var::ObjectIdList_var (const CORBA::ORB::ObjectIdList_var &p) // copy constructor
+CORBA_ORB_ObjectIdList_var::CORBA_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::~ObjectIdList_var (void) // destructor
+CORBA_ORB_ObjectIdList_var::~CORBA_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 index)
+CORBA_ORB_ObjectIdList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-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::ObjectIdList_out (CORBA::ORB::ObjectIdList *&p)
+CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::ORB::ObjectIdList_out::ObjectIdList_out (CORBA::ORB::ObjectIdList_var &p) // constructor from _var
+CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -152,44 +152,44 @@ CORBA::ORB::ObjectIdList_out::ObjectIdList_out (CORBA::ORB::ObjectIdList_var &p)
 }
 
 ACE_INLINE
-CORBA::ORB::ObjectIdList_out::ObjectIdList_out (const CORBA::ORB::ObjectIdList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA::ORB::ObjectIdList_out&,p).ptr_)
+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_)
 {}
 
-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 index)
+CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -210,7 +210,7 @@ operator>> (
 
 ACE_INLINE CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ORB::ObjectIdList &_tao_sequence
+    const CORBA_ORB_ObjectIdList &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -224,7 +224,7 @@ ACE_INLINE CORBA::Boolean operator<< (
   return 0; // error
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ORB::ObjectIdList &_tao_sequence)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
 {
   CORBA::ULong _tao_seq_len;
   if (strm >> _tao_seq_len)
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index e108c13ea22..2c46912a586 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -301,6 +301,11 @@ class TAO_OutputCDR;
 // @@ TODO This should be TAO_TAO_Stub
 class TAO_Stub;
 
+class CORBA_ORB_ObjectIdList;
+class CORBA_ORB_ObjectIdList_var;
+class CORBA_ORB_ObjectIdList_out;
+typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
+
 // enum values defined in tao/NVList.h, bitwise ORed.
 typedef u_int CORBA_Flags;