Clean code for #250 (#421)

* Replace assert(!busy) with nrn_assert
    nrn_assert is compiled too when in release mode.
* Using using instead of typedef

Author: Nicolas Cornu

coreneuron/gpu/nrn_acc_manager.cpp

@@ -464,7 +464,7 @@ void realloc_net_receive_buffer(NrnThread* nt, Memb_list* ml) {
 #endif
 }
 
-typedef std::pair<int, int> NRB_P;
+using NRB_P = std::pair<int, int>;
 
 struct comp {
     bool operator()(const NRB_P& a, const NRB_P& b) {

coreneuron/io/global_vars.cpp

@@ -16,8 +16,8 @@ int (*nrn2core_get_global_int_item_)(const char* name);
 
 using namespace std;
 namespace coreneuron {
-typedef pair<size_t, double*> PSD;
-typedef map<string, PSD> N2V;
+using PSD = pair<size_t, double*>;
+using N2V = map<string, PSD>;
 
 static N2V* n2v;
 

coreneuron/io/nrn_checkpoint.hpp

@@ -71,16 +71,16 @@ extern int patstimtype;
 // nrn_setup.cpp and debugging only information which is retrievable from
 // NrnThread and Memb_list. Ideally, this should all go away
 
-typedef struct Memb_list_ckpnt {
+struct Memb_list_ckpnt {
     // debug only
     double* data_not_permuted;
     Datum* pdata_not_permuted;
     int* nodeindices_not_permuted;
-} Memb_list_chkpnt;
+};
 
 #endif  // CHKPNTDEBUG but another section for it below
 
-typedef struct NrnThreadChkpnt {
+struct NrnThreadChkpnt {
     int file_id;
 
 #if CHKPNTDEBUG
@@ -109,7 +109,7 @@ typedef struct NrnThreadChkpnt {
     int* vecplay_ix;
 #endif  // CHKPNTDEBUG
 
-} NrnThreadChkpnt;
+};
 
 extern NrnThreadChkpnt* nrnthread_chkpnt;
 }  // namespace coreneuron

coreneuron/io/nrn_filehandler.hpp

@@ -157,7 +157,7 @@ class FileHandler {
     }
 
     /** Defined flag values for parse_array() */
-    typedef enum parse_action { read, seek } parse_action;
+    enum parse_action { read, seek };
 
     /** Generic parse function for an array of fixed length.
      *

coreneuron/io/nrnsection_mapping.hpp

@@ -11,9 +11,9 @@
 namespace coreneuron {
 
 /** type to store every section and associated segments */
-typedef std::vector<int> segvec_type;
-typedef std::map<int, segvec_type> secseg_map_type;
-typedef secseg_map_type::iterator secseg_it_type;
+using segvec_type = std::vector<int>;
+using secseg_map_type = std::map<int, segvec_type>;
+using secseg_it_type = secseg_map_type::iterator;
 
 /** @brief Section to segment mapping
  *

coreneuron/mechanism/mech/mod2c_core_thread.hpp

@@ -31,10 +31,10 @@ namespace coreneuron {
  *        and need to be refactored.
  */
 
-typedef int DIFUN;
-typedef int NEWTFUN;
-typedef int SPFUN;
-typedef int EULFUN;
+using DIFUN = int;
+using NEWTFUN = int;
+using SPFUN = int;
+using EULFUN = int;
 #pragma acc routine seq
 extern int nrn_derivimplicit_steer(int, _threadargsproto_);
 #define difun(arg) nrn_derivimplicit_steer(arg, _threadargs_);
@@ -45,28 +45,28 @@ extern int nrn_newton_steer(int, _threadargsproto_);
 extern int nrn_euler_steer(int, _threadargsproto_);
 #define eulerfun(arg) nrn_euler_steer(arg, _threadargs_);
 
-typedef struct Elm {
+struct Elm {
     unsigned row;        /* Row location */
     unsigned col;        /* Column location */
     double* value;       /* The value SOA  _cntml_padded of them*/
     struct Elm* r_up;    /* Link to element in same column */
     struct Elm* r_down;  /*       in solution order */
     struct Elm* c_left;  /* Link to left element in same row */
     struct Elm* c_right; /*       in solution order (see getelm) */
-} Elm;
+};
 #define ELM0 (Elm*)0
 
-typedef struct Item {
+struct Item {
     Elm* elm;
     unsigned norder; /* order of a row */
     struct Item* next;
     struct Item* prev;
-} Item;
+};
 #define ITEM0 (Item*)0
 
-typedef Item List; /* list of mixed items */
+using List = Item; /* list of mixed items */
 
-typedef struct SparseObj {  /* all the state information */
+struct SparseObj {  /* all the state information */
     Elm** rowst;            /* link to first element in row (solution order)*/
     Elm** diag;             /* link to pivot element in row (solution order)*/
     void* elmpool;          /* no interthread cache line sharing for elements */
@@ -87,7 +87,7 @@ typedef struct SparseObj {  /* all the state information */
     List* orderlist; /* list of rows sorted by norder
                              that haven't been used */
     int do_flag;
-} SparseObj;
+};
 
 #pragma acc routine seq
 extern double* _nrn_thread_getelm(SparseObj* so, int row, int col, int _iml);

coreneuron/mechanism/mech/modfile/pattern.mod

@@ -32,12 +32,12 @@ NET_RECEIVE (w) {LOCAL nst
 
 VERBATIM
 
-typedef struct {
+struct Info {
 	int size;
 	double* tvec;
 	int* gidvec;
 	int index;
-} Info;
+};
 
 #define INFOCAST Info** ip = (Info**)(&(_p_ptr))
 

coreneuron/mechanism/mech_mapping.cpp

@@ -8,9 +8,9 @@
 #include "coreneuron/permute/data_layout.hpp"
 
 namespace coreneuron {
-typedef size_t Offset;
-typedef int MechId;
-typedef const char* VariableName;
+using Offset = size_t;
+using MechId = int;
+using VariableName = const char*;
 
 struct cmp_str {
     bool operator()(char const* a, char const* b) const {
@@ -21,7 +21,7 @@ struct cmp_str {
 /*
  * Structure that map variable names of mechanisms to their value's location (offset) in memory
  */
-typedef std::map<MechId, std::map<VariableName, Offset, cmp_str> > MechNamesMapping;
+using MechNamesMapping = std::map<MechId, std::map<VariableName, Offset, cmp_str>>;
 static MechNamesMapping mechNamesMapping;
 
 static void set_an_offset(int mech_id, const char* variable_name, int offset) {

coreneuron/mechanism/mech_mapping.hpp

@@ -21,7 +21,7 @@
 namespace coreneuron {
 struct Memb_list;
 
-typedef const char** SerializedNames;
+using SerializedNames = const char**;
 
 // return pointer to value of a variable's mechanism, or nullptr if not found
 extern double* get_var_location_from_var_name(int mech_id,

coreneuron/mechanism/mechanism.hpp

@@ -49,11 +49,11 @@ union ThreadDatum {
 #endif
 
 /* will go away at some point */
-typedef struct Point_process {
+struct Point_process {
     int _i_instance;
     short _type;
     short _tid; /* NrnThread id */
-} Point_process;
+};
 
 struct NetReceiveBuffer_t {
     int* _displ;     /* _displ_cnt + 1 of these */