mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 19:17:53 +08:00
58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
|
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
|
||
|
index ee0418b8fca..da9d9741e28 100644
|
||
|
--- a/ace/Process_Manager.cpp
|
||
|
+++ b/ace/Process_Manager.cpp
|
||
|
@@ -26,6 +26,9 @@ ACE_Process_Manager_cleanup (void *instance, void *arg)
|
||
|
{
|
||
|
ACE_Process_Manager::cleanup (instance, arg);
|
||
|
}
|
||
|
+#define ACE_PROCESS_MANAGER_CLEANUP_FUNCTION ACE_Process_Manager_cleanup
|
||
|
+#else
|
||
|
+#define ACE_PROCESS_MANAGER_CLEANUP_FUNCTION ACE_Process_Manager::cleanup
|
||
|
#endif
|
||
|
|
||
|
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||
|
@@ -124,19 +127,10 @@ ACE_Process_Manager::instance (void)
|
||
|
// Register with the Object_Manager so that the wrapper to
|
||
|
// delete the proactor will be called when Object_Manager is
|
||
|
// being terminated.
|
||
|
-
|
||
|
-#if defined ACE_HAS_SIG_C_FUNC
|
||
|
- ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
|
||
|
- ACE_Process_Manager_cleanup,
|
||
|
- 0,
|
||
|
- typeid (*ACE_Process_Manager::instance_).name ());
|
||
|
-#else
|
||
|
ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
|
||
|
- ACE_Process_Manager::cleanup,
|
||
|
+ ACE_PROCESS_MANAGER_CLEANUP_FUNCTION,
|
||
|
0,
|
||
|
- typeid (*ACE_Process_Manager::instance_).name ());
|
||
|
-#endif /* ACE_HAS_SIG_C_FUNC */
|
||
|
-
|
||
|
+ typeid (ACE_Process_Manager).name ());
|
||
|
}
|
||
|
}
|
||
|
|
||
|
@@ -157,18 +151,10 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm)
|
||
|
// Register with the Object_Manager so that the wrapper to
|
||
|
// delete the proactor will be called when Object_Manager is
|
||
|
// being terminated.
|
||
|
-
|
||
|
-#if defined ACE_HAS_SIG_C_FUNC
|
||
|
- ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
|
||
|
- ACE_Process_Manager_cleanup,
|
||
|
- 0,
|
||
|
- typeid (*ACE_Process_Manager::instance_).name ());
|
||
|
-#else
|
||
|
ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
|
||
|
- ACE_Process_Manager::cleanup,
|
||
|
+ ACE_PROCESS_MANAGER_CLEANUP_FUNCTION,
|
||
|
0,
|
||
|
- typeid (*ACE_Process_Manager::instance_).name ());
|
||
|
-#endif /* ACE_HAS_SIG_C_FUNC */
|
||
|
+ typeid (*t).name ());
|
||
|
|
||
|
ACE_Process_Manager::instance_ = tm;
|
||
|
return t;
|