Skip to content

Commit 7b503d9

Browse files
authored
Merge pull request #1826 from McStasMcXtrace/willend-patch3
Minor comp revisions, suppresses compilation warnings from clang
2 parents 9daddaf + 6249b66 commit 7b503d9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mcstas-comps/optics/Elliptic_guide_gravity.comp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ SETTING PARAMETERS (xwidth = 0,yheight = 0,l,
140140
string verbose = "on",
141141
enableGravity = 1.0,
142142
curvature=0,
143-
nSegments=-1,
143+
int nSegments=-1,
144144
vector mvaluesright=NULL, vector mvaluesleft=NULL, vector mvaluestop=NULL, vector mvaluesbottom=NULL,
145145
vector seglength=NULL)
146146

mcstas-comps/optics/Pol_mirror.comp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ INITIALIZE
111111
if (strlen(rUpData) && strcmp(rUpData,"NULL")){
112112
if (Table_Read(&rUpTable, rUpData, 1) <= 0) {
113113
fprintf(stderr,"Pol_mirror: %s: can not read file %s\n",
114-
NAME_CURRENT_COMP, rUpPar);
114+
NAME_CURRENT_COMP, rUpData);
115115
exit(1);
116116
}
117117
rUpTableFlag=1;
@@ -121,7 +121,7 @@ INITIALIZE
121121
if (strlen(rUpData) && strcmp(rUpData,"NULL")){
122122
if (Table_Read(&rDownTable, rDownData, 1) <= 0) {
123123
fprintf(stderr,"Pol_mirror: %s: can not read file %s\n",
124-
NAME_CURRENT_COMP, rDownPar);
124+
NAME_CURRENT_COMP, rDownData);
125125
exit(1);
126126
}
127127
rDownTableFlag=1;

0 commit comments

Comments
 (0)