diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-07-06 22:16:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 13:16:24 -0700 |
| commit | ac4e90220adb99d7cea190c41d798ac113f20627 (patch) | |
| tree | 1115f166c93829da7b56091ce8824b6ec0b41b41 /ports/ace/process_manager.patch | |
| parent | e5e521a0d13abc76e5ab95ab940c58db676e65d0 (diff) | |
| download | vcpkg-ac4e90220adb99d7cea190c41d798ac113f20627.tar.gz vcpkg-ac4e90220adb99d7cea190c41d798ac113f20627.zip | |
[ace] 6.5.10 (#12183)
* [ace] 6.5.10
* Add version macros to make the port file easier to update
* ports/ace/portfile.cmake:
* Updated macro names to have ACE_ prefix
* ports/ace/portfile.cmake:
* Use string replace
* ports/ace/portfile.cmake:
Diffstat (limited to 'ports/ace/process_manager.patch')
| -rw-r--r-- | ports/ace/process_manager.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/ports/ace/process_manager.patch b/ports/ace/process_manager.patch deleted file mode 100644 index 4871b5ee6..000000000 --- a/ports/ace/process_manager.patch +++ /dev/null @@ -1,57 +0,0 @@ -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; |
