Merge branch 'master' into meaningful-types

neuronsimulator · Sep 27, 2023 · f092099 · f092099
2 parents c106dce + 8985d2b
commit f092099
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -91,7 +91,8 @@ Installation
 
    .. tab-item:: macOS
 
-      The recommended installation is to:
+      The recommended installation is to open a Terminal (Press `⌘` + `Space` and type "terminal")
+      and type:
 
       .. code::
 
@@ -104,7 +105,7 @@ Installation
 
    .. tab-item:: Linux
 
-      The recommended installation is to:
+      The recommended installation is to open a terminal and type:
 
       .. code::
 

diff --git a/docs/install/install_instructions.md b/docs/install/install_instructions.md
@@ -8,7 +8,7 @@ Windows platforms.
 
 #### Mac OS
 
-Since version 7.8.1 we are providing Python wheels and NEURON can be installed using `pip` as:
+Since version 7.8.1 we are providing Python wheels and NEURON can be installed using `pip` by opening a Terminal (Press `⌘` + `Space` and type "terminal") and typing:
 
 ```
 pip3 install neuron
@@ -107,7 +107,7 @@ architecture.
 
 #### Linux
 
-Like Mac OS, since 7.8.1 release python wheels are provided and you can use `pip` to install NEURON as:
+Like Mac OS, since 7.8.1 release python wheels are provided and you can use `pip` to install NEURON by opening a terminal and typing:
 
 ```
 pip3 install neuron

diff --git a/src/nmodl/modl.cpp b/src/nmodl/modl.cpp
@@ -61,7 +61,7 @@ extern int mkdir_p(const char*);
 
 extern int vectorize;
 extern int numlist;
-extern char* nmodl_version_;
+extern const char* nmodl_version_;
 extern int usederivstatearray;
 
 /*SUPPRESS 763*/

diff --git a/src/nmodl/noccout.cpp b/src/nmodl/noccout.cpp
@@ -5,7 +5,7 @@
 #include "parse1.hpp"
 #include "symbol.h"
 
-extern char* nmodl_version_;
+extern const char* nmodl_version_;
 
 #define P(arg) fputs(arg, fcout)
 List *procfunc, *initfunc, *modelfunc, *termfunc, *initlist, *firstlist;
@@ -85,10 +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("#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("#include \"neuron/cache/mechanism_range.hpp\"\n");
     P("#include <vector>\n");
 
@@ -481,10 +483,12 @@ void c_out_vectorize() {
     P("#undef PI\n");
     P("#define nil 0\n");
     P("#define _pval pval\n");  // due to some old models using _pval
+    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 on\n");
     P("#include \"neuron/cache/mechanism_range.hpp\"\n");
     printlist(defs_list);
     printlist(firstlist);

diff --git a/src/nmodl/nocpout.cpp b/src/nmodl/nocpout.cpp
@@ -63,10 +63,13 @@ directly by hoc.
 #include "parse1.hpp"
 
 #include <algorithm>
+#include <iterator>  // std::back_inserter
 #include <stdlib.h>
 #include <string>
 #include <vector>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #define GETWD(buf) getcwd(buf, NRN_BUFSIZE)
 
 int vectorize = 1;

diff --git a/src/oc/fileio.cpp b/src/oc/fileio.cpp
@@ -473,7 +473,7 @@ void hoc_sprint1(char** ppbuf, int argn) { /* convert args to right type for con
 }
 
 #if defined(WIN32)
-static FILE* oc_popen(char* cmd, char* type) {
+static FILE* oc_popen(char const* const cmd, char const* const type) {
     FILE* fp;
     char buf[1024];
     assert(strlen(cmd) + 20 < 1024);

diff --git a/src/oc/wrap_sprintf.h b/src/oc/wrap_sprintf.h
@@ -1,4 +1,6 @@
 #include <cstdio>
+#include <utility>  // std::forward
+
 namespace neuron {
 /**
  * @brief Redirect sprintf to snprintf if the buffer size can be deduced.