X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/956cb23848021301bcb4c20fd31675f65e4348e5..fa19d0ae9393f2f40864104eb2af3fa46015f1a2:/src/kernel/activity/MutexImpl.hpp diff --git a/src/kernel/activity/MutexImpl.hpp b/src/kernel/activity/MutexImpl.hpp index 8937ee2149..613d799477 100644 --- a/src/kernel/activity/MutexImpl.hpp +++ b/src/kernel/activity/MutexImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,9 +11,10 @@ #include namespace simgrid { -namespace simix { +namespace kernel { +namespace activity { -class XBT_PUBLIC() MutexImpl { +class XBT_PUBLIC MutexImpl { public: MutexImpl(); ~MutexImpl(); @@ -27,7 +28,7 @@ public: bool locked = false; smx_actor_t owner = nullptr; // List of sleeping processes: - simgrid::simix::SynchroList sleeping; + simgrid::kernel::actor::SynchroList sleeping; // boost::intrusive_ptr support: friend void intrusive_ptr_add_ref(MutexImpl* mutex) @@ -41,12 +42,13 @@ public: delete mutex; } - simgrid::s4u::Mutex& mutex() { return mutex_; } + simgrid::s4u::Mutex& mutex() { return piface_; } private: std::atomic_int_fast32_t refcount_{1}; - simgrid::s4u::Mutex mutex_; + simgrid::s4u::Mutex piface_; }; } } +} #endif /* SIMIX_MUTEXIMPL_HPP */