threads: add per-thread "return" values for 'model-checking/user context' switch

[model-checker.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 5a7c5349b3cd98ad446e0eb90189cd4b695dbbfa..cfd99c66177568a642947c2959d87582010282c8 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -75,7 +75,7 @@ void ClockVector::merge(ClockVector *cv)
  * thread, false otherwise. That is, this function returns:
  * <BR><CODE>act <= cv[act->tid]</CODE>
  */
-bool ClockVector::synchronized_since(ModelAction *act) const
+bool ClockVector::synchronized_since(const ModelAction *act) const
 {
        int i = id_to_int(act->get_tid());
 
@@ -88,7 +88,7 @@ bool ClockVector::synchronized_since(ModelAction *act) const
  * Gets the clock corresponding to a given thread id from the clock
  * vector. */
 
-int ClockVector::getClock(thread_id_t thread) {
+modelclock_t ClockVector::getClock(thread_id_t thread) {
        int threadid = id_to_int(thread);
 
        if (threadid < num_threads)