code_patches/v2018.04.2/SRC_BASE_MACOS.patch at 3a0b13b18d77813cdb059c5216f7d2ee79e02587 · OpenHeartDevelopers/code_patches · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
diff --git a/Modules/CppMicroServices/core/src/service/usServiceListeners.cpp b/Modules/CppMicroServices/core/src/service/usServiceListeners.cpp
index 39217e79ea..29b46e008a 100644
--- a/Modules/CppMicroServices/core/src/service/usServiceListeners.cpp
+++ b/Modules/CppMicroServices/core/src/service/usServiceListeners.cpp
@@ -79,7 +79,7 @@ void ServiceListeners::AddModuleListener(ModuleContext* mc, const ModuleListener
 {
   MutexLock lock(moduleListenerMapMutex);
   ModuleListenerMap::value_type::second_type& listeners = moduleListenerMap[mc];
-  if (std::find_if(listeners.begin(), listeners.end(), std::bind1st(ModuleListenerCompare(), std::make_pair(listener, data))) == listeners.end())
+  if (std::find_if(listeners.begin(), listeners.end(), std::bind(ModuleListenerCompare(), std::make_pair(listener, data), std::placeholders::_1)) == listeners.end())
   {
     listeners.push_back(std::make_pair(listener, data));
   }
@@ -88,7 +88,7 @@ void ServiceListeners::AddModuleListener(ModuleContext* mc, const ModuleListener
 void ServiceListeners::RemoveModuleListener(ModuleContext* mc, const ModuleListener& listener, void* data)
 {
   MutexLock lock(moduleListenerMapMutex);
-  moduleListenerMap[mc].remove_if(std::bind1st(ModuleListenerCompare(), std::make_pair(listener, data)));
+  moduleListenerMap[mc].remove_if(std::bind(ModuleListenerCompare(), std::make_pair(listener, data), std::placeholders::_1));
 }

 void ServiceListeners::ModuleChanged(const ModuleEvent& evt)
diff --git a/Modules/CppMicroServices/core/src/util/usListenerFunctors_p.h b/Modules/CppMicroServices/core/src/util/usListenerFunctors_p.h
index 8bbe3a2d8a..581d281ed8 100644
--- a/Modules/CppMicroServices/core/src/util/usListenerFunctors_p.h
+++ b/Modules/CppMicroServices/core/src/util/usListenerFunctors_p.h
@@ -50,7 +50,7 @@
 US_BEGIN_NAMESPACE
   template<class X>
   US_MODULE_LISTENER_FUNCTOR ModuleListenerMemberFunctor(X* x, void (X::*memFn)(const US_PREPEND_NAMESPACE(ModuleEvent)))
-  { return std::bind1st(std::mem_fun(memFn), x); }
+  { return std::bind(std::mem_fn(memFn), x, std::placeholders::_1); }

   struct ModuleListenerCompare : std::binary_function<std::pair<US_MODULE_LISTENER_FUNCTOR, void*>,
                                                       std::pair<US_MODULE_LISTENER_FUNCTOR, void*>, bool>
@@ -65,7 +65,7 @@ US_BEGIN_NAMESPACE

   template<class X>
   US_SERVICE_LISTENER_FUNCTOR ServiceListenerMemberFunctor(X* x, void (X::*memFn)(const US_PREPEND_NAMESPACE(ServiceEvent)))
-  { return std::bind1st(std::mem_fun(memFn), x); }
+  { return std::bind(std::mem_fn(memFn), x, std::placeholders::_1); }

   struct ServiceListenerCompare : std::binary_function<US_SERVICE_LISTENER_FUNCTOR, US_SERVICE_LISTENER_FUNCTOR, bool>
   {
diff --git a/Utilities/IpPic/mitkIpPic.h b/Utilities/IpPic/mitkIpPic.h
index 0cc63aa766..4e16191c1e 100644
--- a/Utilities/IpPic/mitkIpPic.h
+++ b/Utilities/IpPic/mitkIpPic.h
@@ -231,9 +231,7 @@
 #include <stdio.h>
 #include <string.h>

-#ifdef sun
-#  include <unistd.h>
-#endif
+#include <unistd.h>