Thu Oct 23 06:29:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 16 insertions, 14 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b516bb2a4c9..51afccdb16f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,21 +1,32 @@
+Thu Oct 23 06:29:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Process.cpp:
+          Initialise handle_inheritance_ on the right place
+
+        * ace/Process.h:
+          Doxygen change
+
+        * ace/Process.inl:
+          Always implement the handle_inheritance method
+
 Wed Oct 22 15:03:31 UTC 2008  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
         * ace/Process.h (ACE_Process_Options): Fixed the duplicate
-          handle_inheritance_ member. 
+          handle_inheritance_ member.
 
 Wed Oct 22 13:30:54 UTC 2008  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
         * ace/Process.{h,cpp}: Added support for enabling/disabling handle
           inheritance on Linux.  Thanks to Christian Fromme <christian at
           ast.dfs dot de> for this fix.
-  
+
         * ace/Process.{h,cpp}: Fixed the misspelling of
           "handle_inheritence" to "handle_inheritance".
 
 Tue Oct 21 18:31:52 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * apps/gperf/src/Options.cpp:
-        
+
           Moved the instantiation of the static ACE_CString
           members to appear before the global class instantiation,
           so that the ACE_CString default constructor can in turn
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 7f586ad630e..8abadfb31eb 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -810,12 +810,12 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
     stdin_ (ACE_INVALID_HANDLE),
     stdout_ (ACE_INVALID_HANDLE),
     stderr_ (ACE_INVALID_HANDLE),
-    handle_inheritance_ (true),
     ruid_ ((uid_t) -1),
     euid_ ((uid_t) -1),
     rgid_ ((uid_t) -1),
     egid_ ((uid_t) -1),
 #endif /* ACE_WIN32 */
+    handle_inheritance_ (true),
     set_handles_called_ (0),
     environment_buf_index_ (0),
     environment_argv_index_ (0),
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 77588dd7cea..0ab94c2f7a7 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -376,7 +376,7 @@ protected:
   uid_t egid_;
 #endif /* ACE_WIN32 */
 
-  /// Default TRUE.
+  /// Default true.
   bool handle_inheritance_;
 
 #if !defined (ACE_HAS_WINCE)
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index df15539db83..e77db92f5bc 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -149,22 +149,13 @@ ACE_Process_Options::setgroup (pid_t pgrp)
 ACE_INLINE int
 ACE_Process_Options::handle_inheritance (void)
 {
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_VXWORKS) && !defined(ACE_OPENVMS)
   return handle_inheritance_;
-#else
-    ACE_NOTSUP_RETURN (0);  // This is a benign error.
-#endif /* ! ACE_HAS_WINCE && !ACE_VXWORKS && !ACE_OPENVMS */
 }
 
 ACE_INLINE void
 ACE_Process_Options::handle_inheritance (int hi)
 {
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_VXWORKS) && !defined(ACE_OPENVMS)
   handle_inheritance_ = hi;
-#else
-  ACE_UNUSED_ARG (hi);
-  ACE_NOTSUP;
-#endif /* !ACE_HAS_WINCE && !ACE_VXWORKS && !ACE_OPENVMS */
 }
 
 ACE_INLINE int