Merge pull request #2376 from heplesser/fix-2295-return-past-assert

Ensure consistent return values in "impossible" situations even if assertions are compiled out
nest · May 12, 2022 · 8fe7986 · 8fe7986
2 parents c4250d6 + 13314ad
commit 8fe7986
Show file tree

Hide file tree

Showing 34 changed files with 65 additions and 63 deletions.
diff --git a/models/bernoulli_synapse.h b/models/bernoulli_synapse.h
@@ -132,7 +132,7 @@ class bernoulli_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/clopath_synapse.h b/models/clopath_synapse.h
@@ -166,7 +166,7 @@ class clopath_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/cont_delay_synapse.h b/models/cont_delay_synapse.h
@@ -147,42 +147,42 @@ class cont_delay_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( RateEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DataLoggingRequest&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( CurrentEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( ConductanceEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DoubleDataEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DSSpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DSCurrentEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/gamma_sup_generator.h b/models/gamma_sup_generator.h
@@ -227,7 +227,7 @@ gamma_sup_generator::send_test_event( Node& target, rport receptor_type, syninde
     SpikeEvent e;
     e.set_sender( *this );
     const port p = target.handles_test_event( e, receptor_type );
-    if ( p != invalid_port_ )
+    if ( p != invalid_port )
     {
       // count number of targets
       ++P_.num_targets_;

diff --git a/models/ht_synapse.h b/models/ht_synapse.h
@@ -153,7 +153,7 @@ class ht_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/jonke_synapse.h b/models/jonke_synapse.h
@@ -262,7 +262,7 @@ class jonke_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/multimeter.cpp b/models/multimeter.cpp
@@ -51,7 +51,7 @@ multimeter::send_test_event( Node& target, rport receptor_type, synindex, bool )
   DataLoggingRequest e( P_.interval_, P_.offset_, P_.record_from_ );
   e.set_sender( *this );
   port p = target.handles_test_event( e, receptor_type );
-  if ( p != invalid_port_ and not is_model_prototype() )
+  if ( p != invalid_port and not is_model_prototype() )
   {
     B_.has_targets_ = true;
   }

diff --git a/models/music_cont_out_proxy.cpp b/models/music_cont_out_proxy.cpp
@@ -223,7 +223,7 @@ nest::music_cont_out_proxy::send_test_event( Node& target, rport receptor_type,
   DataLoggingRequest e( P_.interval_, P_.record_from_ );
   e.set_sender( *this );
   port p = target.handles_test_event( e, receptor_type );
-  if ( p != invalid_port_ and not is_model_prototype() )
+  if ( p != invalid_port and not is_model_prototype() )
   {
     B_.has_targets_ = true;
   }

diff --git a/models/noise_generator.cpp b/models/noise_generator.cpp
@@ -275,7 +275,7 @@ nest::noise_generator::send_test_event( Node& target, rport receptor_type, synin
     CurrentEvent e;
     e.set_sender( *this );
     const port p = target.handles_test_event( e, receptor_type );
-    if ( p != invalid_port_ and not is_model_prototype() )
+    if ( p != invalid_port and not is_model_prototype() )
     {
       ++P_.num_targets_;
     }

diff --git a/models/poisson_generator_ps.h b/models/poisson_generator_ps.h
@@ -219,7 +219,7 @@ poisson_generator_ps::send_test_event( Node& target, rport receptor_type, synind
     SpikeEvent e;
     e.set_sender( *this );
     const port p = target.handles_test_event( e, receptor_type );
-    if ( p != invalid_port_ and not is_model_prototype() )
+    if ( p != invalid_port and not is_model_prototype() )
     {
       ++P_.num_targets_; // count number of targets
     }

diff --git a/models/ppd_sup_generator.h b/models/ppd_sup_generator.h
@@ -251,7 +251,7 @@ ppd_sup_generator::send_test_event( Node& target, rport receptor_type, synindex
     SpikeEvent e;
     e.set_sender( *this );
     const port p = target.handles_test_event( e, receptor_type );
-    if ( p != invalid_port_ and not is_model_prototype() )
+    if ( p != invalid_port and not is_model_prototype() )
     {
       ++P_.num_targets_; // count number of targets
     }

diff --git a/models/quantal_stp_synapse.h b/models/quantal_stp_synapse.h
@@ -156,7 +156,7 @@ class quantal_stp_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/sinusoidal_gamma_generator.h b/models/sinusoidal_gamma_generator.h
@@ -367,7 +367,7 @@ sinusoidal_gamma_generator::send_test_event( Node& target, rport receptor_type,
       SpikeEvent e;
       e.set_sender( *this );
       const rport r = target.handles_test_event( e, receptor_type );
-      if ( r != invalid_port_ and not is_model_prototype() )
+      if ( r != invalid_port and not is_model_prototype() )
       {
         ++P_.num_trains_;
       }

diff --git a/models/static_synapse.h b/models/static_synapse.h
@@ -101,42 +101,42 @@ class static_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( RateEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DataLoggingRequest&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( CurrentEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( ConductanceEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DoubleDataEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DSSpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DSCurrentEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/static_synapse_hom_w.h b/models/static_synapse_hom_w.h
@@ -87,42 +87,42 @@ class static_synapse_hom_w : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( RateEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DataLoggingRequest&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( CurrentEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( ConductanceEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DoubleDataEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DSSpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
     port
     handles_test_event( DSCurrentEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_dopamine_synapse.h b/models/stdp_dopamine_synapse.h
@@ -258,7 +258,7 @@ class stdp_dopamine_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_nn_pre_centered_synapse.h b/models/stdp_nn_pre_centered_synapse.h
@@ -180,7 +180,7 @@ class stdp_nn_pre_centered_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_nn_restr_synapse.h b/models/stdp_nn_restr_synapse.h
@@ -175,7 +175,7 @@ class stdp_nn_restr_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_nn_symm_synapse.h b/models/stdp_nn_symm_synapse.h
@@ -177,7 +177,7 @@ class stdp_nn_symm_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_pl_synapse_hom.h b/models/stdp_pl_synapse_hom.h
@@ -179,7 +179,7 @@ class stdp_pl_synapse_hom : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_synapse.h b/models/stdp_synapse.h
@@ -167,7 +167,7 @@ class stdp_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_synapse_facetshw_hom.h b/models/stdp_synapse_facetshw_hom.h
@@ -283,7 +283,7 @@ class stdp_facetshw_synapse_hom : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_synapse_hom.h b/models/stdp_synapse_hom.h
@@ -212,7 +212,7 @@ class stdp_synapse_hom : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/stdp_triplet_synapse.h b/models/stdp_triplet_synapse.h
@@ -176,7 +176,7 @@ class stdp_triplet_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/tsodyks2_synapse.h b/models/tsodyks2_synapse.h
@@ -174,7 +174,7 @@ class tsodyks2_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/tsodyks_synapse.h b/models/tsodyks_synapse.h
@@ -193,7 +193,7 @@ class tsodyks_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/tsodyks_synapse_hom.h b/models/tsodyks_synapse_hom.h
@@ -226,7 +226,7 @@ class tsodyks_synapse_hom : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/urbanczik_synapse.h b/models/urbanczik_synapse.h
@@ -161,7 +161,7 @@ class urbanczik_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };
 

diff --git a/models/vogels_sprekeler_synapse.h b/models/vogels_sprekeler_synapse.h
@@ -144,7 +144,7 @@ class vogels_sprekeler_synapse : public Connection< targetidentifierT >
     port
     handles_test_event( SpikeEvent&, rport )
     {
-      return invalid_port_;
+      return invalid_port;
     }
   };