Assertions should not have side effects (#886)

Author: olupton

coreneuron/io/core2nrn_data_return.cpp

@@ -546,7 +546,8 @@ void core2nrn_tqueue(NrnThread& nt) {
     }
     // TQitems from binq_
     for (q = tqe->binq_->first(); q; q = tqe->binq_->next(q)) {
-        assert(core2nrn_tqueue_item(q, sewm, nt) == false);
+        bool const result = core2nrn_tqueue_item(q, sewm, nt);
+        assert(result == false);
     }
 
     // For self events with weight, find the NetCon index and send that

coreneuron/io/phase2.cpp

@@ -246,10 +246,10 @@ void Phase2::read_file(FileHandler& F, const NrnThread& nt) {
         preSynConditionEventFlags.push_back(F.read_int());
     }
 
-    assert(F.read_int() == -1);
+    nrn_assert(F.read_int() == -1);
     restore_events(F);
 
-    assert(F.read_int() == -1);
+    nrn_assert(F.read_int() == -1);
     restore_events(F);
 }