flo/overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sci-biology/micro-manager: udpate'

Browse Source
This commit is contained in:
Florian Tham
2017-03-14 23:02:24 +01:00
parent 919c8cf8ce
commit 6a244673b1
16 changed files with 6045 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sci-biology/micro-manager/files/boost_ipc_detail.patch Normal file
View File

@@ -0,0 +1,24 @@
--- MMCore/FastLogger.cpp.orig 2012-09-28 21:38:41.510071984 -0400
+++ MMCore/FastLogger.cpp 2012-09-28 21:41:08.738231368 -0400
@@ -39,6 +39,12 @@
#else
#endif
#include "boost/interprocess/detail/os_thread_functions.hpp"
+#include "boost/version.hpp"
+#if BOOST_VERSION >= 104800
+# define BOOST_IPC_DETAIL boost::interprocess::ipcdetail
+#else
+# define BOOST_IPC_DETAIL boost::interprocess::detail
+#endif
using namespace std;
const char* g_textLogIniFiled = "Logging initialization failed\n";
@@ -469,7 +475,7 @@
}
// display the process id
- boost::interprocess::detail::OS_process_id_t pidd = boost::interprocess::detail::get_current_process_id();
+ BOOST_IPC_DETAIL::OS_process_id_t pidd = BOOST_IPC_DETAIL::get_current_process_id();
std::ostringstream percentPReplacement;
percentPReplacement << pidd;