Remove all HTList

neuronsimulator · Dec 10, 2024 · f7149cc · f7149cc
1 parent f1d19d4
commit f7149cc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 218 deletions.
diff --git a/cmake/NeuronFileLists.cmake b/cmake/NeuronFileLists.cmake
@@ -156,7 +156,6 @@ set(IVOC_FILE_LIST
     grglyph.cpp
     grmanip.cpp
     hocmark.cpp
-    htlist.cpp
     idraw.cpp
     ivoc.cpp
     ivocmain.cpp

diff --git a/src/ivoc/htlist.cpp b/src/ivoc/htlist.cpp
diff --git a/src/ivoc/htlist.h b/src/ivoc/htlist.h
diff --git a/src/nrncvode/cvodeobj.h b/src/nrncvode/cvodeobj.h
@@ -18,7 +18,6 @@ struct BAMech;
 struct NrnThread;
 class PlayRecord;
 class STEList;
-class HTList;
 namespace neuron {
 struct model_sorted_token;
 }

diff --git a/src/nrncvode/netcon.h b/src/nrncvode/netcon.h
@@ -2,7 +2,6 @@
 
 #undef check
 
-#include "htlist.h"
 #include "neuron/container/data_handle.hpp"
 #include "nrnmpi.h"
 #include "nrnneosm.h"
@@ -212,7 +211,7 @@ class ConditionEvent: public DiscreteEvent {
     static unsigned long deliver_qthresh_;
 };
 
-class WatchCondition: public ConditionEvent, public HTList {
+class WatchCondition: public ConditionEvent {
   public:
     WatchCondition(Point_process*, double (*)(Point_process*));
     virtual ~WatchCondition();
@@ -242,6 +241,19 @@ class WatchCondition: public ConditionEvent, public HTList {
 
     static unsigned long watch_send_;
     static unsigned long watch_deliver_;
+
+    void Remove() {
+        if (next) {
+            next->prev = prev;
+        }
+        if (prev) {
+            prev->next = next;
+        }
+        prev = nullptr;
+        next = nullptr;
+    }
+    WatchCondition* next = nullptr;
+    WatchCondition* prev = nullptr;
 };
 
 class STECondition: public WatchCondition {

diff --git a/src/nrncvode/netcvode.cpp b/src/nrncvode/netcvode.cpp
@@ -5238,14 +5238,10 @@ void ConditionEvent::abandon_statistics(Cvode* cv) {
 }
 
 WatchCondition::WatchCondition(Point_process* pnt, double (*c)(Point_process*))
-    : HTList(nullptr) {
-    pnt_ = pnt;
-    c_ = c;
-    watch_index_ = 0;  // For transfer, will be a small positive integer.
-}
+    : pnt_(pnt), c_(c), watch_index_(0)
+{}
 
 WatchCondition::~WatchCondition() {
-    // printf("~WatchCondition\n");
     Remove();
 }
 
@@ -5455,7 +5451,7 @@ void Cvode::evaluate_conditions(NrnThread* nt) {
         }
     }
     if (z.watch_list_) {
-        for (auto& item: *z.watch_list_){
+        for (WatchCondition* item: *z.watch_list_){
             item->condition(this);
         }
     }