Mon Jul 9 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 24 insertions, 25 deletions

diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 0122922e141..48ba7af2809 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -1311,7 +1311,7 @@ extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
                                                ACE_CDR::Char*& x);
 extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
                                                ACE_CDR::WChar*& x);
-                                               
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* __ACE_INLINE__ */
diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp
index 4b63b55ec69..e13dac866ad 100644
--- a/ACE/ace/OS_NS_unistd.cpp
+++ b/ACE/ace/OS_NS_unistd.cpp
@@ -15,6 +15,7 @@ ACE_RCSID (ace, OS_NS_unistd, "$Id$")
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
+#include "ace/Auto_Ptr.h"
 #include "ace/os_include/sys/os_pstat.h"
 #include "ace/os_include/sys/os_sysctl.h"
 
@@ -227,8 +228,9 @@ pid_t
 ACE_OS::fork_exec (ACE_TCHAR *argv[])
 {
 # if defined (ACE_WIN32)
-  ACE_TCHAR *buf = 0;
 
+  ACE_TCHAR *buf = 0;
+  ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_ptr (buf);
   if (ACE_OS::argv_to_string (argv, buf) != -1)
     {
       PROCESS_INFORMATION process_info;
@@ -266,10 +268,8 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
           ACE_OS::close (process_info.hThread);
           ACE_OS::close (process_info.hProcess);
           // Return new process id.
-          delete [] buf;
           return process_info.dwProcessId;
         }
-      delete [] buf;
     }
 
   // CreateProcess failed.
diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp
index 2f21fa94d1d..887176dc6f0 100644
--- a/ACE/ace/Object_Manager.cpp
+++ b/ACE/ace/Object_Manager.cpp
@@ -314,7 +314,7 @@ ACE_Object_Manager::ACE_Object_Manager (void)
 
 ACE_Object_Manager::~ACE_Object_Manager (void)
 {
-  dynamically_allocated_ = 0;   // Don't delete this again in fini()
+  dynamically_allocated_ = false;   // Don't delete this again in fini()
   fini ();
 }
 
@@ -327,14 +327,14 @@ ACE_Object_Manager::instance (void)
 
   if (instance_ == 0)
     {
-      ACE_Object_Manager *instance_pointer;
+      ACE_Object_Manager *instance_pointer = 0;
 
       ACE_NEW_RETURN (instance_pointer,
                       ACE_Object_Manager,
                       0);
       ACE_ASSERT (instance_pointer == instance_);
 
-      instance_pointer->dynamically_allocated_ = 1;
+      instance_pointer->dynamically_allocated_ = true;
 
       return instance_pointer;
     }
diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp
index d79791311f2..d0ee232408c 100644
--- a/ACE/ace/Object_Manager_Base.cpp
+++ b/ACE/ace/Object_Manager_Base.cpp
@@ -42,7 +42,7 @@ int ACE_SEH_Default_Exception_Handler (void *)
 
 ACE_Object_Manager_Base::ACE_Object_Manager_Base (void)
   : object_manager_state_ (OBJ_MAN_UNINITIALIZED)
-  , dynamically_allocated_ (0)
+  , dynamically_allocated_ (false)
   , next_ (0)
 {
 }
@@ -51,7 +51,7 @@ ACE_Object_Manager_Base::~ACE_Object_Manager_Base (void)
 {
 #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
   // Clear the flag so that fini () doesn't delete again.
-  dynamically_allocated_ = 0;
+  dynamically_allocated_ = false;
 #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 }
 
@@ -110,7 +110,7 @@ ACE_OS_Object_Manager::ACE_OS_Object_Manager (void)
 
 ACE_OS_Object_Manager::~ACE_OS_Object_Manager (void)
 {
-  dynamically_allocated_ = 0;   // Don't delete this again in fini()
+  dynamically_allocated_ = false;   // Don't delete this again in fini()
   fini ();
 }
 
@@ -180,7 +180,7 @@ ACE_OS_Object_Manager::instance (void)
 
   if (instance_ == 0)
     {
-      ACE_OS_Object_Manager *instance_pointer;
+      ACE_OS_Object_Manager *instance_pointer = 0;
 
       ACE_NEW_RETURN (instance_pointer,
                       ACE_OS_Object_Manager,
@@ -189,7 +189,7 @@ ACE_OS_Object_Manager::instance (void)
       // brings down the Log msg stuff
       // ACE_ASSERT (instance_pointer == instance_);
 
-      instance_pointer->dynamically_allocated_ = 1;
+      instance_pointer->dynamically_allocated_ = true;
 
     }
 
diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h
index c8855373c56..ec9170292d5 100644
--- a/ACE/ace/Object_Manager_Base.h
+++ b/ACE/ace/Object_Manager_Base.h
@@ -108,7 +108,7 @@ protected:
    * application, then the application is responsible for destroying
    * it.)
    */
-  unsigned int dynamically_allocated_;
+  bool dynamically_allocated_;
 
   /// Link to next Object_Manager, for chaining.
   ACE_Object_Manager_Base *next_;
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index f963cc2929b..e3bc298ea2b 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -28,17 +28,17 @@ ACE_RCSID (ace,
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-  /**
-   * @c ACE_Service_Config is supposed to be a Singleton. This is the
-   * only Configuration Gestalt available for access from static
-   * initializers at proces start-up time. Using Unmanaged Singleton
-   * is safer because (a) the Object Manager may not yet be fully initialized in the
-   * context of a static initializer that uses SC, and (b) because we
-   * know that upon process exit the SC will still be automaticaly and explicitely closed
-   * by @c ACE_Object_Manager::fini().
-   */
-  typedef ACE_Unmanaged_Singleton<ACE_Service_Config,
-                                  ACE_SYNCH_RECURSIVE_MUTEX> ACE_SERVICE_CONFIG_SINGLETON;
+/**
+  * @c ACE_Service_Config is supposed to be a Singleton. This is the
+  * only Configuration Gestalt available for access from static
+  * initializers at proces start-up time. Using Unmanaged Singleton
+  * is safer because (a) the Object Manager may not yet be fully initialized in the
+  * context of a static initializer that uses SC, and (b) because we
+  * know that upon process exit the SC will still be automaticaly and explicitely closed
+  * by @c ACE_Object_Manager::fini().
+  */
+typedef ACE_Unmanaged_Singleton<ACE_Service_Config,
+                                ACE_SYNCH_RECURSIVE_MUTEX> ACE_SERVICE_CONFIG_SINGLETON;
 
 
 ///
@@ -57,7 +57,6 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg)
       (void)ACE_Service_Config::current (psg);
 }
 
-///
 ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void)
 {
   ACE_Service_Config::current (this->saved_);