Skip to content
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

Minor improvements from #2027 #2051

Merged
merged 4 commits into from
Nov 1, 2022
Merged

Minor improvements from #2027 #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee108ef
Bump submodule past iv#45.
olupton Nov 1, 2022
69d0565
PyObject_HEAD contains an ;
olupton Nov 1, 2022
3fb93a0
drop nrn_isdouble
olupton Nov 1, 2022
735935d
drop unused memory pool code
olupton Nov 1, 2022
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
2 changes: 1 addition & 1 deletion .clang-format.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SortIncludes: false
Standard: c++17
StatementMacros: [MKDLL, MKDLLdec, MKDLLif, MKDLLvp, MKDLLvpf,
StatementMacros: [MKDLL, MKDLLdec, MKDLLif, MKDLLvp, MKDLLvpf, PyObject_HEAD,
declareActionCallback, declareAdjustStepper, declareArrowGlyph, declareFieldEditorCallback,
declareFieldSEditorCallback, declareFileChooserCallback, declareIOCallback, declareList, declarePool,
declarePtrList, declareRubberCallback, declareSelectionCallback, declareTable, declareTable2,
Expand Down
1 change: 0 additions & 1 deletion cmake/CompilerHelper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "PGI" OR CMAKE_C_COMPILER_ID MATCHES "NVHPC")
# August 2021. It would clearly be nicer to apply these suppressions only to relevant files.
# Examples of the suppressed warnings are given below.
# ~~~
# "src/oc/isoc99.h", warning #1-D: last line of file ends without a newline
# "src/nrniv/nvector_nrnserial_ld.cpp", warning #47-D: incompatible redefinition of macro "..."
# "src/nmodl/kinetic.cpp", warning #111-D: statement is unreachable
# "src/nmodl/parsact.cpp", warning #128-D: loop is not reachable
Expand Down
2 changes: 0 additions & 2 deletions cmake/NeuronFileLists.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ set(HEADER_FILES_TO_INSTALL
hocgetsym.h
hoclist.h
hocparse.h
isoc99.h
ivstream.h
mcran4.h
md1redef.h
Expand Down Expand Up @@ -79,7 +78,6 @@ set(OC_FILE_LIST
hocusr.cpp
hoc_init.cpp
hoc_oop.cpp
isoc99.cpp
list.cpp
math.cpp
mswinprt.cpp
Expand Down
2 changes: 1 addition & 1 deletion external/iv
Open in desktop
Submodule iv updated 1 files
+1 −1 CMakeLists.txt
2 changes: 0 additions & 2 deletions src/ivoc/nrnmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include "isoc99.h"
#include "nrnconf.h"
#include "nrnmpi.h"
#include "../nrncvode/nrnneosm.h"
Expand All @@ -19,7 +18,6 @@ extern "C" void nrnmpi_init(int nrnmpi_under_nrncontrol, int* pargc, char*** par
#endif

int main(int argc, char** argv, char** env) {
nrn_isdouble(0, 0, 0);
nrn_main_launch = 1;

#if defined(AUTO_DLOPEN_NRNMECH) && AUTO_DLOPEN_NRNMECH == 0
Expand Down
2 changes: 2 additions & 0 deletions src/ivoc/ocnotify.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#pragma once
#include <InterViews/observe.h>

#include <cstddef> // std::size_t

void nrn_notify_freed(void (*pf)(void*, int));
void nrn_notify_when_void_freed(void* p, Observer* ob);
void nrn_notify_when_double_freed(double* p, Observer* ob);
Expand Down
Loading