X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ftests_basis%2Ftest_mutex.cpp;h=86175c4ed0b4213e4bb8bd4aa69744c11e930dd1;hb=c43b7a2003e8aa28c8da6428239f34e7f404315c;hp=83ba313b015148e2235ff0681115815f543ffd8f;hpb=19ab994d8ea15bf16ed2f20c651f1a1d5abd12e3;p=feisty_meow.git diff --git a/nucleus/library/tests_basis/test_mutex.cpp b/nucleus/library/tests_basis/test_mutex.cpp index 83ba313b..86175c4e 100644 --- a/nucleus/library/tests_basis/test_mutex.cpp +++ b/nucleus/library/tests_basis/test_mutex.cpp @@ -136,7 +136,7 @@ public: // we grab the lock. auto_synchronizer locked(guard()); // in this case, we make use of auto-synchronizer, handily testing it as well. - ASSERT_TRUE(&locked != NIL, "auto_synchronizer should grab the mutex object's lock"); + ASSERT_TRUE(&locked != NULL_POINTER, "auto_synchronizer should grab the mutex object's lock"); // this is not a real test, but indicates that we did actually increase the number of // unit tests by one, since we're using auto_synchronizer now. safe_add(grab_lock, 1); @@ -241,14 +241,14 @@ int test_mutex::execute() amorph thread_list; for (int i = 0; i < DEFAULT_FISH; i++) { - ethread *t = NIL; + ethread *t = NULL_POINTER; if (i % 2) t = new piranha(*this); else t = new barracuda(*this); thread_list.append(t); ethread *q = thread_list[thread_list.elements() - 1]; ASSERT_EQUAL(q, t, "amorph pointer equivalence is required"); // start the thread we added. - q->start(NIL); + q->start(NULL_POINTER); } time_stamp when_to_leave(DEFAULT_RUN_TIME);