Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into redef_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mgeplf committed Aug 30, 2024
2 parents 42dd21f + 24222db commit a4be9da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/nmodl/noccout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ void c_out() {
P("#undef PI\n");
P("#define nil 0\n");
P("#define _pval pval\n"); // due to some old models using _pval
P("// clang-format on\n");
P("// clang-format off\n");
P("#include \"md1redef.h\"\n");
P("#include \"section_fwd.hpp\"\n");
P("#include \"nrniv_mf.h\"\n");
P("#include \"md2redef.h\"\n");
P("// clang-format off\n");
P("// clang-format on\n");
P("#include \"neuron/cache/mechanism_range.hpp\"\n");
P("#include <vector>\n");

Expand Down
3 changes: 0 additions & 3 deletions src/nrnoc/vclmp.mod
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,6 @@ PROCEDURE update() {
e0 = e
vo0 = vo
vi0 = vi
VERBATIM
return 0;
ENDVERBATIM
}

COMMENT
Expand Down

0 comments on commit a4be9da

Please sign in to comment.