ChangeLogTag: Fri Jan 10 09:53:45 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

6 files changed, 19 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fee337aec24..695c08499ab 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jan 10 09:53:45 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/ORB.cpp:
+        * tao/ORB.h:
+        * tao/ORB_Core.cpp:
+        * tao/ORB_Core.h:
+        * tao/corbafwd.h:
+
+          Removed typedef of ObjectIdList * to ObjectIdList_ptr.
+          Only interfaces and some well-known pseudo-objects
+          should have the _ptr typedef.
+
 Fri Jan 10 09:30:51 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/ObjectIDList.cpp:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index b72cc7bc8f2..710daa6a596 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1164,7 +1164,7 @@ CORBA_ORB::register_initial_reference (const char * id,
 }
 
 
-CORBA_ORB_ObjectIdList_ptr
+CORBA_ORB_ObjectIdList *
 CORBA_ORB::list_initial_services (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index d2847821837..adb823bfdee 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -426,7 +426,7 @@ public:
 
   /// Returns a sequence of ObjectIds that lists which objects have
   /// references available via the initial references mechanism.
-  CORBA_ORB_ObjectIdList_ptr list_initial_services (
+  CORBA_ORB_ObjectIdList *list_initial_services (
               ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 763329bf158..01f07fe33b5 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2133,7 +2133,7 @@ TAO_ORB_Core::resolve_rir (const char *name
   return CORBA::Object::_nil ();
 }
 
-CORBA::ORB::ObjectIdList_ptr
+CORBA::ORB::ObjectIdList *
 TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Unsupported initial services should NOT be included in the below list!
@@ -2149,7 +2149,7 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
     + this->init_ref_map_.current_size ()
     + this->object_ref_table_.current_size ();
 
-  CORBA::ORB::ObjectIdList_ptr tmp = 0;
+  CORBA::ORB::ObjectIdList *tmp = 0;
 
   ACE_NEW_THROW_EX (tmp,
                     CORBA_ORB_ObjectIdList (total_size),
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index a3f668d84c7..76015a61de2 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -751,7 +751,9 @@ public:
   void portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks);
 
   /// List all the service known by the ORB
-  CORBA_ORB_ObjectIdList_ptr list_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  CORBA_ORB_ObjectIdList *list_initial_references (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+    );
 
   /// Reference counting...
   CORBA::ULong _incr_refcnt (void);
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index b81c44aa410..b581fe74cb1 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -251,11 +251,6 @@ class TAO_InputCDR;
 class TAO_OutputCDR;
 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;
-
 class CORBA_StringSeq;
 class CORBA_StringSeq_var;
 class CORBA_StringSeq_out;