Skip to content

Commit 6ca29f2

Browse files
committed
Two unused-var warnings in multiple-scatter program addressed, and ROOT min version more specific in the README. -MMS
1 parent e885051 commit 6ca29f2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ In order to compile and run NEST, the following are required:
7272
The following are optional, depending on intended use of NEST:
7373

7474
* GEANT4 (tested as high as Geant4.10.7.p01)
75-
* ROOT (version 6 or higher: tested on 6.24/04 most recently on Mac OSX, 6.24/06 on CentOS 7)
75+
* ROOT (version 6.22/04 or higher, as it breaks on 6.22/03, ever since C++17 switchover: tested on 6.24/04 most recently on Mac OSX, 6.24/06 on CentOS 7)
7676

7777
<a name="config"></a>
7878
### Running CMake

examples/multipleScatter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ int main(int argc, char **argv) {
8181
// open the first file and get the S1, S2, and their correction factors
8282
FILE *file1 = fopen(argv[4], "r");
8383
double a, b, c, d, e, f, g, h, i, j, k, l, m, n;
84-
int ch, nLines = 0, o;
84+
int ch, nLines = 0;
8585
vector<double> S1a, S2a;
8686
vector<double> S1a_corFactor, S2a_corFactor;
8787
if (verbosity) {
@@ -115,7 +115,7 @@ int main(int argc, char **argv) {
115115
// Load the 2nd file if provided, and stitch the two together to make multiple scatter events
116116
// scatters
117117
FILE *file2 = fopen(argv[5], "r");
118-
ch, nLines = 0, o;
118+
ch, nLines = 0;
119119
double a2, b2, c2, d2, e2, f2, g2, h2, i2, j2, k2, l2, m2, n2;
120120
vector<double> S1b, S2b;
121121
vector<double> S1b_corFactor, S2b_corFactor;

0 commit comments

Comments
 (0)