From 6b49a0fc2e4919c2cdb233907219a55017eb265b Mon Sep 17 00:00:00 2001 From: Derek Yeh Date: Tue, 21 Jul 2020 17:56:16 -0700 Subject: [PATCH] fix warnings --- model.cc | 6 +++--- model.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model.cc b/model.cc index 03f4648e..0493e7e2 100644 --- a/model.cc +++ b/model.cc @@ -373,9 +373,9 @@ uint64_t ModelChecker::switch_thread(ModelAction *act) } while (next->is_model_thread() || next->is_complete() || next->get_pending() && curr_thread_num < get_num_threads()); */ - Thread *next; + Thread *next = NULL; curr_thread_num++; - while (curr_thread_num < get_num_threads) { + while (curr_thread_num < get_num_threads()) { thread_id_t tid = int_to_id(curr_thread_num); next = get_thread(tid); if (!next->is_model_thread() && !next->is_complete() && !next->get_pending()) @@ -450,7 +450,7 @@ void ModelChecker::run() curr_thread_num = 0; thread_id_t tid = int_to_id(0); Thread *thr = get_thread(tid); - switch_from_master(tid); + switch_from_master(thr); /* for (unsigned int i = 0;i < get_num_threads();i++) { thread_id_t tid = int_to_id(i); diff --git a/model.h b/model.h index a1a04d13..8a2f9c65 100644 --- a/model.h +++ b/model.h @@ -78,7 +78,7 @@ private: int execution_number; - int curr_thread_num; + unsigned int curr_thread_num; unsigned int get_num_threads() const; -- 2.34.1