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

3 files changed, 20 insertions, 18 deletions

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]);