towards getting rid of STL

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 78729bd38ac4d9da05d25527450f6668f38be997..b0540699aee48bdca071ef1894d9690e7395c38e 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -423,11 +423,10 @@ void ModelChecker::run()
                         * thread which just took a step--plus the first step
                         * for any newly-created thread
                         */
-                       ModelAction * pending;
                        for (unsigned int i = 0;i < get_num_threads();i++) {
                                thread_id_t tid = int_to_id(i);
                                Thread *thr = get_thread(tid);
-                               if (!thr->is_model_thread() && !thr->is_complete() && ((!(pending=thr->get_pending())) || is_nonsc_write(pending)) ) {
+                               if (!thr->is_model_thread() && !thr->is_complete() && (!thr->get_pending())) {
                                        switch_from_master(thr);        // L: context swapped, and action type of thr changed.
                                        if (thr->is_waiting_on(thr))
                                                assert_bug("Deadlock detected (thread %u)", i);