From 72f8aa7183c617d811d408169933e9b92be1c534 Mon Sep 17 00:00:00 2001 From: degomme Date: Fri, 4 Mar 2016 16:02:23 +0100 Subject: [PATCH] Conflicting declaration. --- src/simix/BoostContext.cpp | 2 +- src/simix/BoostContext.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simix/BoostContext.cpp b/src/simix/BoostContext.cpp index 9972e783b7..3a7ea342f9 100644 --- a/src/simix/BoostContext.cpp +++ b/src/simix/BoostContext.cpp @@ -55,7 +55,7 @@ public: bool BoostContext::parallel_ = false; xbt_parmap_t BoostContext::parmap_ = nullptr; -uintptr_t BoostContext::threads_working_ = 0; +uintptr_t BoostContext::threads_working_ = 0; xbt_os_thread_key_t BoostContext::worker_id_key_; unsigned long BoostContext::process_index_ = 0; BoostContext* BoostContext::maestro_context_ = nullptr; diff --git a/src/simix/BoostContext.hpp b/src/simix/BoostContext.hpp index 62b6066b57..032e116e91 100644 --- a/src/simix/BoostContext.hpp +++ b/src/simix/BoostContext.hpp @@ -31,7 +31,7 @@ protected: // static static bool parallel_; static xbt_parmap_t parmap_; static std::vector workers_context_; - static unsigned long threads_working_; + static uintptr_t threads_working_; static xbt_os_thread_key_t worker_id_key_; static unsigned long process_index_; static BoostContext* maestro_context_; -- 2.20.1