added ACE_Object_Manager_fini to avoid circular include problems

3 files changed, 15 insertions, 6 deletions

diff --git a/ace/OS.i b/ace/OS.i
index b6e50f3a51d..98ae947192c 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -7305,12 +7305,12 @@ ACE_OS::exit (int status)
 {
   // ACE_TRACE ("ACE_OS::exit");
 
-#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
   // Shut down the ACE_Object_Manager.  With
   // ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
   // instantiated on the main's stack.  ::exit () doesn't destroy it.
-  ACE_Object_Manager::fini ();
-#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
+  ACE_Object_Manager_fini ();
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
 #if !defined (ACE_HAS_WINCE)
 # if defined (ACE_WIN32)
@@ -10449,12 +10449,12 @@ fflush (FILE *fp)
 ACE_INLINE void
 exit (int status)
 {
-#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
   // Shut down the ACE_Object_Manager.  With
   // ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
   // instantiated on the main's stack.  ::exit () doesn't destroy it.
-  ACE_Object_Manager::fini ();
-#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
+  ACE_Object_Manager_fini ();
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
   ACE_OS::exit (status);
 }
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 67dc50b614d..81dc4d5e1cf 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -54,6 +54,12 @@ void *ACE_Object_Manager::preallocated_object[
 void *ACE_Object_Manager::preallocated_array[
   ACE_Object_Manager::ACE_PREALLOCATED_ARRAYS] = { 0 };
 
+void
+ACE_Object_Manager_fini (void)
+{
+  ACE_Object_Manager::fini ();
+}
+
 // Handy macros for use by ACE_Object_Manager constructor to
 // preallocate or delete an object or array, either statically (in
 // global data) or dynamically (on the heap).
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 7c13d6efb34..5f78c61f8be 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -17,6 +17,9 @@
 #ifndef ACE_OBJECT_MANAGER_H
 #define ACE_OBJECT_MANAGER_H
 
+// Declaration to avoid circular include problems.
+void ACE_Object_Manager_fini (void);
+
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)