Thu Nov 1 11:11:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 6 insertions, 40 deletions

diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index 551333761be..1c1c147af8f 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -135,40 +135,6 @@ public:
 
 #define ACE_Component_Config ACE_Service_Config
 
-/// This specialization enures ACE_TSS will _not_ perform a delete on
-/// (ACE_Service_Gestalt*) p upon thread exit, when TSS is cleaned
-/// up. Note that the tss_ member will be destroyed with the
-/// ACE_Object_Manager's ACE_Service_Config singleton, so no leaks
-/// will be introduced.
-/// We need this non-ownership ACE_TSS because the SC instance is
-/// really owned by the Object Manager and only it must do the cleanup.
-///
-/// Naturally, things would be simpler, if we could
-/// avoid using the TSS altogether but we need the ability to
-/// temporarily designate a different SC instance as the "default."
-/// So, the solution is a hybrid, or non-owner ACE_TSS.  See bugzila
-/// 2980 for a description of a test case where ACE_TSS::cleanup() is
-/// called before ~ACE_Object_Manager.
-
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-// Since ACE_TSS<>::cleanup() is only defined in
-// multithreaded builds ...
-template<> inline void
-ACE_TSS<ACE_Service_Gestalt>::cleanup (void*ptr)
-{
-  // Borland C++ 2007 *needs* the parameter
-  // name, but it is not clear why ...
-  ACE_UNUSED_ARG (ptr);
-}
-# else
-template<> inline
-ACE_TSS<ACE_Service_Gestalt>::~ACE_TSS (void)
-{
-  // Without threads, the ACE_TSS cleanup is done by ~ACE_TSS()
-}
-# endif /* ACE_MT_SAFE */
-
-
 /**
  * @class ACE_Service_Config
  *
@@ -212,7 +178,7 @@ public:
    * signum to a negative number will prevent a signal handler being
    * registered when the repository is opened.
    */
-  ACE_Service_Config (int ignore_static_svcs = 1,
+  ACE_Service_Config (bool ignore_static_svcs = true,
                       size_t size = ACE_Service_Gestalt::MAX_SERVICES,
                       int signum = SIGHUP);
 
@@ -305,7 +271,7 @@ public:
    * Performs an open without parsing command-line arguments.  The
    * @a logger_key indicates where to write the logging output, which
    * is typically either a STREAM pipe or a socket address.  If
-   * @a ignore_static_svcs is 1 then static services are not loaded,
+   * @a ignore_static_svcs is true then static services are not loaded,
    * otherwise, they are loaded.  If @a ignore_default_svc_conf_file is
    * non-0 then the <svc.conf> configuration file will be ignored.
    * Returns zero upon success, -1 if the file is not found or cannot
@@ -357,11 +323,11 @@ public:
    * @param logger_key   Indicates where to write the logging output,
    *                     which is typically either a STREAM pipe or a
    *                     socket address.
-   * @param ignore_static_svcs   If 1 then static services are not loaded,
+   * @param ignore_static_svcs   If true then static services are not loaded,
    *                             otherwise, they are loaded.
    * @param ignore_default_svc_conf_file  If non-0 then the @c svc.conf
    *                                      configuration file will be ignored.
-   * @param ignore_debug_flag If non-0 then the application is responsible
+   * @param ignore_debug_flag If true then the application is responsible
    *                          for setting the @c ACE_Log_Msg::priority_mask
    *                          appropriately.
    *
@@ -379,7 +345,7 @@ public:
                    bool ignore_debug_flag = false);
 
   /// Tidy up and perform last rites when ACE_Service_Config is shut
-  /// down.  This method calls <close_svcs>.  Returns 0.
+  /// down.  This method calls close_svcs().  Returns 0.
   static int close (void);
 
   /// Perform user-specified close hooks and possibly delete all of the
@@ -500,7 +466,7 @@ public:
    * @return Returns -1 if the service cannot be 'loaded'.
    */
   static int process_directive (const ACE_Static_Svc_Descriptor &ssd,
-                                int force_replace = 0);
+                                bool force_replace = false);
 
   /**
    * Process (or re-process) service configuration requests that are