ChangeLogTag: Mon Apr 18 11:26:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 39 insertions, 64 deletions

diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 835aa2362a7..73583bc8a71 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -162,7 +162,7 @@ Notifier_i::market_status (const char *stock_name,
               stock_name,
               stock_value));
 
-  CONSUMERS *consumers;
+  CONSUMERS *consumers = 0;
 
   if (this->consumer_map_.find (stock_name, consumers) == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 9c44cf5350e..34c12955a71 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -113,7 +113,7 @@ TAO_CEC_Reactive_ConsumerControl::need_to_disconnect (
                                     PortableServer::ServantBase* proxy)
 {
   bool disconnect = true;
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
+  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry = 0;
   if (this->event_channel_->
       get_servant_retry_map ().find (proxy, entry) == 0)
     {
@@ -131,7 +131,7 @@ void
 TAO_CEC_Reactive_ConsumerControl::successful_transmission (
                                     PortableServer::ServantBase* proxy)
 {
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
+  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry = 0;
   if (this->event_channel_->
       get_servant_retry_map ().find (proxy, entry) == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index bdc01705782..f8763272c3c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -115,7 +115,7 @@ TAO_CEC_Reactive_SupplierControl::need_to_disconnect (
                                     PortableServer::ServantBase* proxy)
 {
   bool disconnect = true;
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
+  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry = 0;
   if (this->event_channel_->
       get_servant_retry_map ().find (proxy, entry) == 0)
     {
@@ -133,7 +133,7 @@ void
 TAO_CEC_Reactive_SupplierControl::successful_transmission (
                                     PortableServer::ServantBase* proxy)
 {
-  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry;
+  TAO_CEC_EventChannel::ServantRetryMap::ENTRY* entry = 0;
   if (this->event_channel_->
       get_servant_retry_map ().find (proxy, entry) == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 680d5cb3cfe..069752f35e9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -128,7 +128,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     }
   else
     {
-      ACE_Command_Base* command;
+      ACE_Command_Base* command = 0;
       ACE_NEW (command,
                Connected_Command (this,
                                   proxy));
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index ada7a93c739..0ef48309d9d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -507,6 +507,24 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from)
 
   return entry;
 }
+
+void
+TAO_ECG_CDR_Message_Receiver::shutdown (void)
+{
+  // ACE_GUARD (ACE_Lock, guard, *this->lock_);
+
+  Request_Map::iterator end = this->request_map_.end ();
+  for (Request_Map::iterator i =  this->request_map_.begin ();
+       i != end;
+       ++i)
+    {
+      delete (*i).int_id_;
+      (*i).int_id_ = 0;
+    }
+
+  this->ignore_from_.reset ();
+}
+
 // ****************************************************************
 int
 TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
index f2706941f70..95530584ccd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
@@ -44,19 +44,3 @@ TAO_ECG_CDR_Message_Receiver::init (TAO_ECG_Refcounted_Endpoint ignore_from
 //      }
 }
 
-ACE_INLINE void
-TAO_ECG_CDR_Message_Receiver::shutdown (void)
-{
-  // ACE_GUARD (ACE_Lock, guard, *this->lock_);
-
-  Request_Map::iterator end = this->request_map_.end ();
-  for (Request_Map::iterator i =  this->request_map_.begin ();
-       i != end;
-       ++i)
-    {
-      delete (*i).int_id_;
-      (*i).int_id_ = 0;
-    }
-
-  this->ignore_from_.reset ();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp
index db7a9a9281e..12e46cba5a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.cpp
@@ -140,7 +140,7 @@ ACE_GPlot_File::set (long entry, long value)
 {
   long old_entry;
   char *val;
-  char *old_value;
+  char *old_value = 0;
 
   ACE_NEW (val, char [32]);
 
@@ -156,7 +156,7 @@ ACE_GPlot_File::set (long entry, float value)
 {
   long old_entry;
   char *val;
-  char *old_value;
+  char *old_value = 0;
 
   ACE_NEW (val, char [32]);
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
index f594ad70b5e..8cf576af02b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
@@ -5,16 +5,10 @@
 
 #include "HTIOP_Connector_Impl.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
 ACE_RCSID(HTIOP,
           TAO_HTIOP_Connector_Impl,
           "$Id$")
 
-
 template <class SVC_HANDLER>
 TAO::HTIOP::Connect_Creation_Strategy<SVC_HANDLER>::
 Connect_Creation_Strategy (ACE_Thread_Manager* t,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 34567542613..90580f62117 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -311,7 +311,7 @@ void TAO::PG_FactoryRegistry::register_factory (
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory);
 
-  RoleInfo * role_info;
+  RoleInfo * role_info = 0;
   auto_ptr<RoleInfo> safe_entry;
   if (this->registry_.find(role, role_info) != 0)
     {
@@ -382,7 +382,7 @@ void TAO::PG_FactoryRegistry::unregister_factory (
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory);
 
-  RoleInfo * role_info;
+  RoleInfo * role_info = 0;
   if (this->registry_.find(role, role_info) == 0)
   {
     PortableGroup::FactoryInfos & infos = role_info->infos_;
@@ -473,7 +473,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
 {
   METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_role);
 
-  RoleInfo * role_info;
+  RoleInfo * role_info = 0;
   if (this->registry_.unbind(role, role_info) == 0)
   {
     ACE_DEBUG(( LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 46a592332ce..69e76fd19b3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -177,7 +177,7 @@ int TAO::PG_Group_Factory::find_group (PortableGroup::ObjectGroup_ptr object_gro
 
 int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroupId group_id)
 {
-  ::TAO::PG_Object_Group * group;
+  ::TAO::PG_Object_Group * group = 0;
   int result = (this->group_map_.unbind (group_id, group) == 0);
   if (result)
   {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index d00480c4dd4..b26544df184 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -271,7 +271,7 @@ TAO::PG_Object_Group::set_primary_member (
                     this->internals_,
                     0);
   int result = 1;
-  MemberInfo * info;
+  MemberInfo * info = 0;
   if (this->members_.find (the_location, info) == 0)
     {
       int cleared = 0;
@@ -347,7 +347,7 @@ TAO::PG_Object_Group::remove_member (
                    PortableGroup::MemberNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
-  MemberInfo * info;
+  MemberInfo * info = 0;
   if (this->members_.unbind (the_location, info) == 0)
     {
       if (this->members_.current_size() > 0)
@@ -579,7 +579,7 @@ TAO::PG_Object_Group::get_member_reference (
 
   CORBA::Object_var result;
 
-  MemberInfo * info;
+  MemberInfo * info = 0;
   if (this->members_.find (the_location, info) == 0)
     {
       result = CORBA::Object::_duplicate (info->member_.in ());
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 1f311775cb6..099ad563a03 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -95,7 +95,7 @@ TAO::PG_Properties_Support::get_type_properties (
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 0);
 
-  TAO::PG_Property_Set * typeid_properties;
+  TAO::PG_Property_Set * typeid_properties = 0;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     typeid_properties->export_properties (*result);
@@ -117,7 +117,7 @@ TAO::PG_Properties_Support::remove_type_properties (
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
-  TAO::PG_Property_Set * typeid_properties;
+  TAO::PG_Property_Set * typeid_properties = 0;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     typeid_properties->remove (props);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index 46d1380f826..c9a90928b1d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -119,7 +119,7 @@ TAO_PG_PropertyManager::set_type_properties (
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
-  Type_Prop_Table::ENTRY * entry;
+  Type_Prop_Table::ENTRY * entry = 0;
   if (this->type_properties_.find (type_id, entry) != 0)
     ACE_THROW (CORBA::BAD_PARAM ());
 
@@ -137,7 +137,7 @@ TAO_PG_PropertyManager::get_type_properties (
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
 
-  Type_Prop_Table::ENTRY * entry;
+  Type_Prop_Table::ENTRY * entry = 0;
   PortableGroup::Properties * type_properties = 0;
 
   if (this->type_properties_.find (type_id, entry) == 0)
@@ -190,7 +190,7 @@ TAO_PG_PropertyManager::remove_type_properties (
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
-  Type_Prop_Table::ENTRY * entry;
+  Type_Prop_Table::ENTRY * entry = 0;
   if (this->type_properties_.find (type_id, entry) != 0)
     ACE_THROW (CORBA::BAD_PARAM ());
 
@@ -271,7 +271,7 @@ TAO_PG_PropertyManager::get_properties (
 
   CORBA::ULong type_props_len = 0;
   PortableGroup::Properties * type_properties = 0;
-  Type_Prop_Table::ENTRY * type_entry;
+  Type_Prop_Table::ENTRY * type_entry = 0;
   if (this->type_properties_.find (type_id.in (), type_entry) == 0)
     {
       type_properties = &type_entry->int_id_;
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index 07ad8367cdf..8a75034c9a5 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -16,20 +16,9 @@
 #include "RTCosScheduling_ClientScheduler_i.i"
 #endif /* __ACE_INLINE__ */
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdio.h"
 
-/**
- *  Note - Before making this file with Makefile.RTCosScheduling, please make
- *  sure that you first comment out the following line from the
- *  RTCosSchedulingS.h file:
- *  //#include "tao/PortableServer/PortableServerS.h"
- */
-
 #include "tao/ORB_Core.h"
 #include "tao/LocalObject.h"
 #include "tao/PortableInterceptorC.h"
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index 5ee39f1c23a..c89d3699c52 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -18,11 +18,6 @@
 #include "tao/Version.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_unistd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Task.h"
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index c9f93d5baea..dbc60e82c6f 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -17,11 +17,6 @@
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "ace/Task.h"
 #include "ace/Get_Opt.h"
 #include "tao/ORB_Core.h"