Thu Mar 16 18:54:11 2000 Pradeep Gore <pradeep@flamenco.cs.wustl.edu>

4 files changed, 25 insertions, 25 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 1a241795c86..942a6b7e715 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -82,7 +82,7 @@ Iterator_i::get (CORBA::ULong position,
   // Iterate over and populate the list.
   LogRecordStore::LOG_RECORD_HASH_MAP_ENTRY *hash_entry;
 
-  DsLogAdmin::RecordList_ptr rec_list;
+  DsLogAdmin::RecordList* rec_list;
   // Figure out the length of the list.
 
   // Allocate the list of <max_rec_list_len_> length.
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index c9fabee48b8..c8562e77eb2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -12,13 +12,13 @@ LogMgr_i::~LogMgr_i ()
   // No-Op.
 }
 
-DsLogAdmin::LogList_ptr
+DsLogAdmin::LogList*
 LogMgr_i::list_logs (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  DsLogAdmin::LogList_ptr list;
+  DsLogAdmin::LogList* list;
 
   // Figure out the length of the list.
   CORBA::ULong len = hash_map_.current_size ();
@@ -83,7 +83,7 @@ LogMgr_i::find_log (DsLogAdmin::LogId id,
     }
 }
 
-DsLogAdmin::LogIdList_ptr
+DsLogAdmin::LogIdList*
 LogMgr_i::list_logs_by_id (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 065c05eae1e..6d38fc48d25 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -59,11 +59,11 @@ Log_i::id (CORBA::Environment &ACE_TRY_ENV)
   return logid_;
 }
 
-DsLogAdmin::QoSList_ptr
+DsLogAdmin::QoSList*
 Log_i::get_qos (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  DsLogAdmin::QoSList_ptr ret_val;
+  DsLogAdmin::QoSList* ret_val;
   ACE_NEW_THROW_EX (ret_val,
                     DsLogAdmin::QoSList (this->qoslist_),
                     CORBA::NO_MEMORY ());
@@ -261,11 +261,11 @@ Log_i::get_availability_status (CORBA::Environment &ACE_TRY_ENV)
   return this->avail_status_;
 }
 
-DsLogAdmin::CapacityAlarmThresholdList_ptr
+DsLogAdmin::CapacityAlarmThresholdList*
 Log_i::get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  DsLogAdmin::CapacityAlarmThresholdList_ptr ret_val;
+  DsLogAdmin::CapacityAlarmThresholdList* ret_val;
   ACE_NEW_THROW_EX (ret_val,
                      DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_),
                      CORBA::NO_MEMORY ());
@@ -290,11 +290,11 @@ Log_i::set_capacity_alarm_thresholds (const
   this->thresholds_ = threshs;
 }
 
-DsLogAdmin::WeekMask_ptr
+DsLogAdmin::WeekMask*
 Log_i::get_week_mask (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  DsLogAdmin::WeekMask_ptr ret_val;
+  DsLogAdmin::WeekMask* ret_val;
   ACE_NEW_THROW_EX (ret_val,
                     DsLogAdmin::WeekMask (this->weekmask_),
                     CORBA::NO_MEMORY ());
@@ -317,7 +317,7 @@ Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks,
   this->weekmask_ = masks;
 }
 
-DsLogAdmin::RecordList_ptr
+DsLogAdmin::RecordList*
 Log_i::query_i (const char *constraint,
                 DsLogAdmin::Iterator_out &iter_out,
                 CORBA::ULong how_many,
@@ -346,7 +346,7 @@ Log_i::query_i (const char *constraint,
   // Iterate over and populate the list.
   LogRecordStore::LOG_RECORD_HASH_MAP_ENTRY *hash_entry;
 
-  DsLogAdmin::RecordList_ptr rec_list;
+  DsLogAdmin::RecordList* rec_list;
   // Figure out the length of the list.
 
   // Allocate the list of <how_many> length.
@@ -419,7 +419,7 @@ Log_i::query_i (const char *constraint,
   return rec_list;
 }
 
-DsLogAdmin::RecordList_ptr
+DsLogAdmin::RecordList*
 Log_i::query (const char *grammar,
               const char *constraint,
               DsLogAdmin::Iterator_out iter_out,
@@ -431,7 +431,7 @@ Log_i::query (const char *grammar,
   this->check_grammar (grammar, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  DsLogAdmin::RecordList_ptr rec_list =
+  DsLogAdmin::RecordList* rec_list =
     this->query_i (constraint,
                    iter_out,
                    this->max_rec_list_len_,
@@ -441,7 +441,7 @@ Log_i::query (const char *grammar,
   return rec_list;
 }
 
-DsLogAdmin::RecordList_ptr
+DsLogAdmin::RecordList*
 Log_i::retrieve (DsLogAdmin::TimeT from_time,
                  CORBA::Long how_many,
                  DsLogAdmin::Iterator_out iter_out,
@@ -465,7 +465,7 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time,
   else
     ACE_OS::sprintf (constraint, "time < %s", uint64_formating);
 
-  DsLogAdmin::RecordList_ptr rec_list =
+  DsLogAdmin::RecordList* rec_list =
     this->query_i (constraint,
                    iter_out,
                    how_many,
@@ -716,7 +716,7 @@ Log_i::set_records_attribute (const char *grammar,
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-DsLogAdmin::NVList_ptr
+DsLogAdmin::NVList*
 Log_i::get_record_attribute (DsLogAdmin::RecordId id,
                              CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -729,7 +729,7 @@ Log_i::get_record_attribute (DsLogAdmin::RecordId id,
                        0);
     }
 
-  DsLogAdmin::NVList_ptr nvlist;
+  DsLogAdmin::NVList* nvlist;
   ACE_NEW_THROW_EX (nvlist,
                     DsLogAdmin::NVList (rec.attr_list),
                     CORBA::NO_MEMORY ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index e8f5133d05b..f5dec13d6dc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -65,7 +65,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the id of the log
 
-  DsLogAdmin::QoSList_ptr
+  DsLogAdmin::QoSList*
   get_qos (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -168,7 +168,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the availability status
 
-  DsLogAdmin::CapacityAlarmThresholdList_ptr
+  DsLogAdmin::CapacityAlarmThresholdList*
     get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the capacity alarm threshold
@@ -186,7 +186,7 @@ public:
   // between wraps (after a wrap, the percentage full resets to
   // 0).
 
-  DsLogAdmin::WeekMask_ptr
+  DsLogAdmin::WeekMask*
   get_week_mask (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the weekly scheduling parameters
@@ -200,7 +200,7 @@ public:
                      DsLogAdmin::InvalidMask));
   // Set the weekly scheduling parameters.
 
-  DsLogAdmin::RecordList_ptr
+  DsLogAdmin::RecordList*
   query (const char * grammar,
 	 const char * c,
 	 DsLogAdmin::Iterator_out i,
@@ -211,7 +211,7 @@ public:
   // Returns all records in the log that match the given constraint
   // <c>.
 
-  DsLogAdmin::RecordList_ptr
+  DsLogAdmin::RecordList*
   retrieve (DsLogAdmin::TimeT from_time,
 	    CORBA::Long how_many,
 	    DsLogAdmin::Iterator_out i,
@@ -283,7 +283,7 @@ public:
   // Set the attributes of all records that matches the
   // constraints with same attr_list.
 
-  DsLogAdmin::NVList_ptr
+  DsLogAdmin::NVList*
   get_record_attribute (DsLogAdmin::RecordId id,
 			CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -316,7 +316,7 @@ public:
 protected:
   // = Helper methods
 
-  DsLogAdmin::RecordList_ptr query_i (const char *constraint,
+  DsLogAdmin::RecordList* query_i (const char *constraint,
                                       DsLogAdmin::Iterator_out &iter_out,
                                       CORBA::ULong how_many,
                                       CORBA::Environment &ACE_TRY_ENV)