change the namespace of mutex from std to cdsc

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index 359316d12a196e2c2d18c10e62685e1c1cf503a6..14160052d24cac65f75161f5a152c6b1f3f4200d 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -285,6 +285,8 @@ Thread * ModelAction::get_thread_operand() const
                /* THREAD_JOIN uses (Thread *) for location */
                return (Thread *)get_location();
        } else if (type == PTHREAD_JOIN) {
+               // return NULL;
+               // thread_operand is stored in execution::pthread_map;
                return (Thread *)get_location();
        } else
                return NULL;
@@ -666,12 +668,12 @@ bool ModelAction::may_read_from(const Promise *promise) const
  * Only valid for LOCK, TRY_LOCK, UNLOCK, and WAIT operations.
  * @return The mutex operated on by this action, if any; otherwise NULL
  */
-std::mutex * ModelAction::get_mutex() const
+cdsc::mutex * ModelAction::get_mutex() const
 {
        if (is_trylock() || is_lock() || is_unlock())
-               return (std::mutex *)get_location();
+               return (cdsc::mutex *)get_location();
        else if (is_wait())
-               return (std::mutex *)get_value();
+               return (cdsc::mutex *)get_value();
        else
                return NULL;
 }