Remove pointtype from global class (#247)

Author: Nicolas Cornu

coreneuron/coreneuron.hpp

@@ -75,10 +75,6 @@ using DependencyTable = std::vector<std::vector<int>>;
  */
 class CoreNeuron {
 
-
-    /// Local to coreneuron, used to keep track of point process IDs
-    int pointtype = 1; /* starts at 1 since 0 means not point in pnt_map*/
-
     /**
      * map if mech is a point process
      * In the future only a field of Mechanism class
@@ -237,15 +233,6 @@ class CoreNeuron {
         return nrn_bbcore_write;
     }
 
-
-    /**
-     * Generate point process IDs for pnt_map starting at 1 (since 0 means no point process)
-     * \return the next available point process ID
-     */
-    int get_next_pointtype() {
-        return pointtype++;
-    }
-
 };
 
 extern CoreNeuron corenrn;

coreneuron/mechanism/register_mech.cpp

@@ -359,14 +359,15 @@ void register_destructor(Pfri d) {
 }
 
 int point_reg_helper(Symbol* s2) {
+    static int next_pointtype = 1; /* starts at 1 since 0 means not point in pnt_map */
     int type;
     type = nrn_get_mechtype(s2);
 
     // No mechanism in the .dat files
     if (type == -1)
         return type;
 
-    corenrn.get_pnt_map()[type] = corenrn.get_next_pointtype();
+    corenrn.get_pnt_map()[type] = next_pointtype++;
     corenrn.get_memb_func(type).is_point = 1;
 
     return corenrn.get_pnt_map()[type];