Skip to content

Fix compilation #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JCGoran wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix compilation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions L5NeuronSimulation/biophys_components/L2-3mechanisms/modfiles/int2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,13 @@ FUNCTION unirand() { : uniform random numbers between 0 and 1
}

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 randGen() {
Expand All @@ -655,7 +660,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand All @@ -671,4 +676,4 @@ VERBATIM
*pv4 = (void*)0;
}
ENDVERBATIM
}
}
9 changes: 7 additions & 2 deletions L5NeuronSimulation/biophys_components/L2-3mechanisms/modfiles/pyr2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,13 @@ FUNCTION sfunc (v (mV)) {
}

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 randGen() {
Expand All @@ -289,7 +294,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand All @@ -308,4 +313,4 @@ ENDVERBATIM
}
:FUNCTION unirand() { : uniform random numbers between 0 and 1
: unirand = scop_random()
:}
:}
5 changes: 5 additions & 0 deletions L5NeuronSimulation/biophys_components/L5mechanisms/modfiles/ProbAMPANMDA2.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,13 @@ VERBATIM
#include<stdio.h>
#include<math.h>

#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

Expand Down
9 changes: 7 additions & 2 deletions L5NeuronSimulation/biophys_components/L5mechanisms/modfiles/int2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,13 @@ FUNCTION unirand() { : uniform random numbers between 0 and 1
}

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 randGen() {
Expand All @@ -655,7 +660,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand All @@ -671,4 +676,4 @@ VERBATIM
*pv4 = (void*)0;
}
ENDVERBATIM
}
}
9 changes: 7 additions & 2 deletions L5NeuronSimulation/biophys_components/L5mechanisms/modfiles/pyr2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,13 @@ FUNCTION sfunc (v (mV)) {
}

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 randGen() {
Expand All @@ -289,7 +294,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand All @@ -308,4 +313,4 @@ ENDVERBATIM
}
:FUNCTION unirand() { : uniform random numbers between 0 and 1
: unirand = scop_random()
:}
:}
7 changes: 6 additions & 1 deletion L5NeuronSimulation/biophys_components/mechanisms/modfiles/int2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,13 @@ FUNCTION unirand() { : uniform random numbers between 0 and 1
}

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 randGen() {
Expand All @@ -655,7 +660,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand Down
5 changes: 5 additions & 0 deletions L5NeuronSimulation/biophys_components/mechanisms/modfiles/modfiles/ProbAMPANMDA2.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,13 @@ VERBATIM
#include<stdio.h>
#include<math.h>

#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

Expand Down
9 changes: 7 additions & 2 deletions L5NeuronSimulation/biophys_components/mechanisms/modfiles/modfiles/int2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,13 @@ FUNCTION unirand() { : uniform random numbers between 0 and 1
}

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 randGen() {
Expand All @@ -655,7 +660,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand All @@ -671,4 +676,4 @@ VERBATIM
*pv4 = (void*)0;
}
ENDVERBATIM
}
}
7 changes: 6 additions & 1 deletion L5NeuronSimulation/biophys_components/mechanisms/modfiles/modfiles/pyr2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,13 @@ FUNCTION sfunc (v (mV)) {
}

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 randGen() {
Expand Down Expand Up @@ -308,4 +313,4 @@ ENDVERBATIM
}
:FUNCTION unirand() { : uniform random numbers between 0 and 1
: unirand = scop_random()
:}
:}
7 changes: 6 additions & 1 deletion L5NeuronSimulation/biophys_components/mechanisms/modfiles/pyr2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,13 @@ FUNCTION sfunc (v (mV)) {
}

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 randGen() {
Expand All @@ -235,7 +240,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand Down
9 changes: 7 additions & 2 deletions L5NeuronSimulation/biophys_components/synaptic_models/pyr2pyr.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,13 @@ FUNCTION omega(Cani (mM), threshold1 (uM), threshold2 (uM)) {
}

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 randGen() {
Expand All @@ -298,7 +303,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.uniform(0,1)
*/
_lrandGen = nrn_random_pick(_p_randObjPtr);
_lrandGen = nrn_random_pick(RANDCAST _p_randObjPtr);
}else{
hoc_execerror("Random object ref not set correctly for randObjPtr"," only via hoc Random");
}
Expand All @@ -314,4 +319,4 @@ VERBATIM
*pv4 = (void*)0;
}
ENDVERBATIM
}
}
Loading