Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 10, 2024
1 parent d26272c commit f0d579e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/nrniv/neuronapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct SymbolTableIterator {
extern int nrn_nobanner_;
extern int diam_changed;
extern int nrn_try_catch_nest_depth;
extern "C" void nrnpy_set_pr_etal(LoggerCallback* myprint, int(*cbpass)(void));
extern "C" void nrnpy_set_pr_etal(LoggerCallback* myprint, int (*cbpass)(void));
int ivocmain_session(int, const char**, const char**, int start_session);
void simpleconnectsection();
extern Object* hoc_newobj1(Symbol*, int);
Expand Down
15 changes: 10 additions & 5 deletions src/nrniv/nrnpy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ static nrnpython_reg_real_t load_nrnpython() {
pyversion = std::to_string(pv10 / factor) + "." + std::to_string(pv10 % factor);
} else {
if (nrnpy_pylib.empty() || nrnpy_pyversion.empty()) {
logger().error("Do not know what Python to load [nrnpy_pylib={} nrnpy_pyversion={}]\n", nrnpy_pylib, nrnpy_pyversion);
logger().error("Do not know what Python to load [nrnpy_pylib={} nrnpy_pyversion={}]\n",
nrnpy_pylib,
nrnpy_pyversion);
return nullptr;
}
pyversion = nrnpy_pyversion;
Expand All @@ -271,10 +273,13 @@ static nrnpython_reg_real_t load_nrnpython() {
auto const iter =
std::find(supported_versions.begin(), supported_versions.end(), pyversion);
if (iter == supported_versions.end()) {
logger().error("Python {} is not supported by this NEURON installation (supported: {})."
"If you are seeing this message, your environment probably contains "
"NRN_PYLIB, NRN_PYTHONEXE and NRN_PYTHONVERSION settings that are "
"incompatible with this NEURON. Try unsetting them.\n", pyversion, fmt::join(supported_versions, " "));
logger().error(
"Python {} is not supported by this NEURON installation (supported: {})."
"If you are seeing this message, your environment probably contains "
"NRN_PYLIB, NRN_PYTHONEXE and NRN_PYTHONVERSION settings that are "
"incompatible with this NEURON. Try unsetting them.\n",
pyversion,
fmt::join(supported_versions, " "));
return nullptr;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/oc/fileio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void nrnpy_pass() {
}
}

extern "C" void nrnpy_set_pr_etal(LoggerCallback* cb, int(*cbpass)(void)) {
extern "C" void nrnpy_set_pr_etal(LoggerCallback* cb, int (*cbpass)(void)) {
logger().setCallback(cb);
nrnpy_pass_callback = cbpass;
}
Expand Down

0 comments on commit f0d579e

Please sign in to comment.