From 3e03c874b2c6d4361a8b58af7277258ffdacbec3 Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Wed, 18 May 2022 10:58:39 +0200 Subject: [PATCH 1/2] MOD-C-2-CPP: Compatibility fixed for NEURON 9.0, 8.2 and 8.1 --- Readme | 6 ++++++ halfgapm1.mod | 7 ++++++- halfgapspk.mod | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Readme b/Readme index 5f47a1a..c06378e 100644 --- a/Readme +++ b/Readme @@ -14,3 +14,9 @@ A movie of the spk.std file is seen with nrngui hinton.hoc p() + + +Update +------ + +MOD files compatibility fixes for upcoming NEURON 9.0, 8.2 and 8.1 diff --git a/halfgapm1.mod b/halfgapm1.mod index 6050755..58575e2 100644 --- a/halfgapm1.mod +++ b/halfgapm1.mod @@ -109,15 +109,20 @@ NET_RECEIVE (w) { : with the global variable time step method. VERBATIM +#ifndef NRN_VERSION_GTEQ_8_2_0 double nrn_random_pick(void* r); void* nrn_random_arg(int argpos); +#define RANDCAST +#else +#define RANDCAST (Rand*) +#endif ENDVERBATIM FUNCTION mynormrand(mean, var) { VERBATIM if (_p_donotuse) { - double x = nrn_random_pick(_p_donotuse); + double x = nrn_random_pick(RANDCAST _p_donotuse); _lmynormrand = x*_lvar + _lmean; }else{ _lmynormrand = _lmean; diff --git a/halfgapspk.mod b/halfgapspk.mod index 3779bd7..135e93b 100644 --- a/halfgapspk.mod +++ b/halfgapspk.mod @@ -102,15 +102,20 @@ NET_RECEIVE (w) { : with the global variable time step method. VERBATIM +#ifndef NRN_VERSION_GTEQ_8_2_0 double nrn_random_pick(void* r); void* nrn_random_arg(int argpos); +#define RANDCAST +#else +#define RANDCAST (Rand*) +#endif ENDVERBATIM FUNCTION mynormrand(mean, var) { VERBATIM if (_p_donotuse) { - double x = nrn_random_pick(_p_donotuse); + double x = nrn_random_pick(RANDCAST _p_donotuse); _lmynormrand = x*_lvar + _lmean; }else{ _lmynormrand = _lmean; From 46852f1cf3635d4a111a3721bbaf0ffcfd0db8e7 Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Mon, 23 May 2022 13:52:37 +0200 Subject: [PATCH 2/2] Cleanup for merge. --- Readme | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Readme b/Readme index c06378e..960a2fe 100644 --- a/Readme +++ b/Readme @@ -15,8 +15,7 @@ A movie of the spk.std file is seen with nrngui hinton.hoc p() - -Update ------- - -MOD files compatibility fixes for upcoming NEURON 9.0, 8.2 and 8.1 +Changelog +--------- +2022-05: Updated MOD files to contain valid C++ and be compatible with + the upcoming versions 8.2 and 9.0 of NEURON.