Accepted most reviewer chagne requests.

Author: nrnhines

src/nrncvode/cvodeobj.cpp

@@ -23,7 +23,6 @@ extern int hoc_return_type_code;
 #include "nrnpy.h"
 #include "tqueue.hpp"
 #include "mymath.h"
-#include "htlist.h"
 #include <nrnmutdec.h>
 
 #if NRN_ENABLE_THREADS

src/nrncvode/cvodeobj.h

@@ -7,6 +7,7 @@
 #include "membfunc.h"
 #include "netcon.h"
 #include "tqitem.hpp"
+#include "htlist.h"
 
 class NetCvode;
 class Daspk;

src/nrncvode/htlist.h

@@ -29,8 +29,7 @@ for fast insertion, deletion, iteration
  * UList - list object.
  */
 
-#ifndef htlist_h
-#define htlist_h
+#pragma once
 
 class HTList {
   public:
@@ -85,4 +84,3 @@ inline void* HTList::operator()() {
 inline void* HTList::vptr() {
     return _object;
 }
-#endif

src/nrncvode/netcvode.cpp

@@ -5931,7 +5931,7 @@ void NetCvode::check_thresh(NrnThread* nt) {  // for default method
 
     for (auto* wl: wl_list_[nt->id]) {
         for (HTList* item = wl->First(); item != wl->End(); item = item->Next()) {
-            WatchCondition* wc = (WatchCondition*) item;
+            WatchCondition* wc = static_cast<WatchCondition*>(item);
             wc->check(nt, nt->_t);
         }
     }
@@ -5949,7 +5949,7 @@ void nrn2core_transfer_WATCH(void (*cb)(int, int, int, int, int)) {
     for (auto& htlists_of_thread: net_cvode_instance->wl_list_) {
         for (HTList* wl: htlists_of_thread) {
             for (HTList* item = wl->First(); item != wl->End(); item = item->Next()) {
-                WatchCondition* wc = (WatchCondition*) item;
+                WatchCondition* wc = static_cast<WatchCondition*>(item);
                 nrn2core_transfer_WatchCondition(wc, cb);
             }
         }

test/coreneuron/test_watchrange.py

@@ -181,6 +181,8 @@ def run(method, nthread):
         h.run()
 
     def series():
+        # the extra (0, 0) tests transition from fixed step 4 threads
+        # to fixed step 1 thread.
         for method in [(0, 0), (0, 0), (1, 0), (1, 1)]:
             for nthread in [1, 4]:
                 run(method, nthread)