ChangeLogTag: Fri Jan 24 10:59:49 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 31 insertions, 20 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bda2c38f07b..cf65fefa3d9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Jan 24 10:59:49 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface_strategy.cpp:
+        * TAO_IDL/util/utl_identifier.cpp:
+        * TAO_IDL/util/utl_stack.cpp:
+
+          Changed some deletes of strings to use either delete []
+          or ACE::strdelete(), to eliminate some complaints from
+          Linux valgrind. Thanks to Craig Rodrigues <crodrigu@bbn.com>
+          for reporting the problem and for sending in patches.
+
 Fri Jan 24 09:04:28 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/fe/fe_interface_header.cpp:
diff --git a/TAO/TAO_IDL/be/be_interface_strategy.cpp b/TAO/TAO_IDL/be/be_interface_strategy.cpp
index 6f18c73c0b9..07a914dc5ab 100644
--- a/TAO/TAO_IDL/be/be_interface_strategy.cpp
+++ b/TAO/TAO_IDL/be/be_interface_strategy.cpp
@@ -553,109 +553,109 @@ be_interface_default_strategy::~be_interface_default_strategy (void)
 {
   if (this->base_proxy_impl_name_ != 0)
     {
-      delete this->base_proxy_impl_name_;
+      delete [] this->base_proxy_impl_name_;
       this->base_proxy_impl_name_ = 0;
     }
 
   if (this->remote_proxy_impl_name_ != 0)
     {
-      delete this->remote_proxy_impl_name_;
+      delete [] this->remote_proxy_impl_name_;
       this->remote_proxy_impl_name_ = 0;
     }
 
   if (this->thruPOA_proxy_impl_name_ != 0)
     {
-      delete this->thruPOA_proxy_impl_name_;
+      delete [] this->thruPOA_proxy_impl_name_;
       this->thruPOA_proxy_impl_name_ = 0;
     }
 
   if (this->direct_proxy_impl_name_ != 0)
     {
-      delete this->direct_proxy_impl_name_;
+      delete [] this->direct_proxy_impl_name_;
       this->direct_proxy_impl_name_ = 0;
     }
 
   if (this->full_base_proxy_impl_name_ != 0)
     {
-      delete this->full_base_proxy_impl_name_;
+      delete [] this->full_base_proxy_impl_name_;
       this->full_base_proxy_impl_name_ = 0;
     }
 
   if (this->full_remote_proxy_impl_name_ != 0)
     {
-      delete this->full_remote_proxy_impl_name_;
+      delete [] this->full_remote_proxy_impl_name_;
       this->full_remote_proxy_impl_name_ = 0;
     }
 
   if (this->full_thruPOA_proxy_impl_name_ != 0)
     {
-      delete this->full_thruPOA_proxy_impl_name_;
+      delete [] this->full_thruPOA_proxy_impl_name_;
       this->full_thruPOA_proxy_impl_name_ = 0;
     }
 
   if (this->full_direct_proxy_impl_name_ != 0)
     {
-      delete this->full_direct_proxy_impl_name_;
+      delete [] this->full_direct_proxy_impl_name_;
       this->full_direct_proxy_impl_name_ = 0;
     }
 
   if (this->base_proxy_broker_ != 0)
     {
-      delete this->base_proxy_broker_;
+      delete [] this->base_proxy_broker_;
       this->base_proxy_broker_ = 0;
     }
 
   if (this->remote_proxy_broker_ != 0)
     {
-      delete this->remote_proxy_broker_;
+      delete [] this->remote_proxy_broker_;
       this->remote_proxy_broker_ = 0;
     }
 
   if (this->strategized_proxy_broker_ != 0)
     {
-      delete this->strategized_proxy_broker_;
+      delete [] this->strategized_proxy_broker_;
       this->strategized_proxy_broker_ = 0;
     }
 
   if (this->full_base_proxy_broker_name_ != 0)
     {
-      delete this->full_base_proxy_broker_name_;
+      delete [] this->full_base_proxy_broker_name_;
       this->full_base_proxy_broker_name_ = 0;
     }
 
   if (this->full_remote_proxy_broker_name_ != 0)
     {
-      delete this->full_remote_proxy_broker_name_;
+      delete [] this->full_remote_proxy_broker_name_;
       this->full_remote_proxy_broker_name_ = 0;
     }
 
   if (this->full_strategized_proxy_broker_name_ != 0)
     {
-      delete this->full_strategized_proxy_broker_name_;
+      delete [] this->full_strategized_proxy_broker_name_;
       this->full_strategized_proxy_broker_name_ = 0;
     }
 
   if (this->client_scope_ != 0)
     {
-      delete this->client_scope_;
+      delete [] this->client_scope_;
       this->client_scope_ = 0;
     }
 
   if (this->flat_client_scope_ != 0)
     {
-      delete this->flat_client_scope_;
+      delete [] this->flat_client_scope_;
       this->flat_client_scope_ = 0;
     }
 
   if (this->server_scope_ != 0)
     {
-      delete this->server_scope_;
+      delete [] this->server_scope_;
       this->server_scope_ = 0;
     }
 
   if (this->flat_server_scope_ != 0)
     {
-      delete this->flat_server_scope_;
+      delete [] this->flat_server_scope_;
       this->flat_server_scope_ = 0;
     }
 }
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index e92f5cf609a..226b02bc293 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -121,7 +121,7 @@ Identifier::~Identifier (void)
 {
   if (this->pv_string != 0)
     {
-      delete this->pv_string;
+      ACE::strdelete (this->pv_string);
       this->pv_string = 0;
     }
 }
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index 26db4e8c209..31a3393b7c7 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -87,7 +87,7 @@ UTL_ScopeStack::~UTL_ScopeStack (void)
 {
   if (this->pd_stack_data != 0)
     {
-      delete this->pd_stack_data;
+      delete [] this->pd_stack_data;
     }
 }