Skip to content

Commit b2755a3

Browse files
wkliaowkliao
authored
Merge pull request #123 from Parallel-NetCDF/int2float
Silence Intel compiler warning: implicit const int float conversion
2 parents 00fa09e + f55b16e commit b2755a3

File tree

7 files changed

+50
-46
lines changed

7 files changed

+50
-46
lines changed

‎test/nc_test/test_get.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ define(`NCT_ITYPE', ``NCT_'Upcase($1)')dnl
8989
dnl
9090

9191
define(`CheckText', `ifelse(`$1',`text', , `== (NCT_ITYPE($1) == NCT_TEXT)')')dnl
92-
define(`CheckRange',`ifelse(`$1',`text', `1', `($2 >= $1_min && $2 <= $1_max)')')dnl
92+
define(`CheckRange',`ifelse(`$1',`text', `1', `($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
9393
define(`IfCheckTextChar', `ifelse(`$1',`text', `if ($2 != NC_CHAR)')')dnl
94-
define(`CheckNumRange',`ifelse(`$1',`text', `1',`inRange3(cdf_format, $2,$3,NCT_ITYPE($1)) && ($2 >= $1_min && $2 <= $1_max)')')dnl
94+
define(`CheckNumRange',`ifelse(`$1',`text', `1',`inRange3(cdf_format, $2,$3,NCT_ITYPE($1)) && ($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
9595

9696
dnl TEST_NC_GET_VAR1(TYPE)
9797
dnl

‎test/nc_test/test_iget.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ define(`NCT_ITYPE', ``NCT_'Upcase($1)')dnl
5454
dnl
5555

5656
define(`CheckText', `ifelse(`$1',`text', , `== (NCT_ITYPE($1) == NCT_TEXT)')')dnl
57-
define(`CheckRange',`ifelse(`$1',`text', `1', `($2 >= $1_min && $2 <= $1_max)')')dnl
57+
define(`CheckRange',`ifelse(`$1',`text', `1', `($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
5858
define(`IfCheckTextChar', `ifelse(`$1',`text', `if ($2 != NC_CHAR)')')dnl
5959
define(`CheckNumRange',
6060
`ifelse(`$1',`text', `1',
61-
`inRange3(cdf_format, $2,$3,NCT_ITYPE($1)) && ($2 >= $1_min && $2 <= $1_max)')')dnl
61+
`inRange3(cdf_format, $2,$3,NCT_ITYPE($1)) && ($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
6262

6363
#include "tests.h"
6464

‎test/nc_test/test_iput.m4‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ define(`CheckText', `ifelse(`$1',`text', , `== (NCT_ITYPE($1) == NCT_TEXT)')')dn
6767
define(`IfCheckTextChar', `ifelse(`$1',`text', `if ($2 != NC_CHAR)')')dnl
6868
define(`CheckNumRange',
6969
`ifelse(`$1',`text', `1',
70-
`inRange3(cdf_format, $2,$3,NCT_ITYPE($1)) && ($2 >= $1_min && $2 <= $1_max)')')dnl
70+
`inRange3(cdf_format, $2,$3,NCT_ITYPE($1)) && ($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
7171
define(`CheckRange3',
7272
`ifelse(`$1',`text', `1',
7373
`inRange3(cdf_format, $2,$3,NCT_ITYPE($1))')')dnl
@@ -83,17 +83,17 @@ hash2nc(const nc_type var_type, int var_rank, MPI_Offset *index)
8383

8484
switch (var_type) {
8585
/* no type conversion will happen for NC_CHAR, use in-memory limits */
86-
case NC_CHAR: min = CHAR_MIN; max = CHAR_MAX; break;
87-
case NC_BYTE: min = X_BYTE_MIN; max = X_BYTE_MAX; break;
88-
case NC_SHORT: min = X_SHORT_MIN; max = X_SHORT_MAX; break;
89-
case NC_INT: min = X_INT_MIN; max = X_INT_MAX; break;
90-
case NC_FLOAT: min = X_FLOAT_MIN; max = X_FLOAT_MAX; break;
91-
case NC_DOUBLE: min = X_DOUBLE_MIN; max = X_DOUBLE_MAX; break;
92-
case NC_UBYTE: min = 0; max = X_UCHAR_MAX; break;
93-
case NC_USHORT: min = 0; max = X_USHORT_MAX; break;
94-
case NC_UINT: min = 0; max = X_UINT_MAX; break;
95-
case NC_INT64: min = X_INT64_MIN; max = X_INT64_MAX; break;
96-
case NC_UINT64: min = 0; max = X_UINT64_MAX; break;
86+
case NC_CHAR: min = CHAR_MIN; max = (double)CHAR_MAX; break;
87+
case NC_BYTE: min = X_BYTE_MIN; max = (double)X_BYTE_MAX; break;
88+
case NC_SHORT: min = X_SHORT_MIN; max = (double)X_SHORT_MAX; break;
89+
case NC_INT: min = X_INT_MIN; max = (double)X_INT_MAX; break;
90+
case NC_FLOAT: min = X_FLOAT_MIN; max = (double)X_FLOAT_MAX; break;
91+
case NC_DOUBLE: min = X_DOUBLE_MIN; max = (double)X_DOUBLE_MAX; break;
92+
case NC_UBYTE: min = 0; max = (double)X_UCHAR_MAX; break;
93+
case NC_USHORT: min = 0; max = (double)X_USHORT_MAX; break;
94+
case NC_UINT: min = 0; max = (double)X_UINT_MAX; break;
95+
case NC_INT64: min = X_INT64_MIN; max = (double)X_INT64_MAX; break;
96+
case NC_UINT64: min = 0; max = (double)X_UINT64_MAX; break;
9797
default:
9898
return NC_EBADTYPE;
9999
}

‎test/nc_test/test_put.m4‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ define(`CheckText', `ifelse(`$1',`text', , `== (NCT_ITYPE($1) == NCT_TEXT)')')dn
120120
define(`IfCheckTextChar', `ifelse(`$1',`text', `if ($2 != NC_CHAR)')')dnl
121121
define(`CheckNumRange',
122122
`ifelse(`$1',`text', `1',
123-
`inRange3(cdf_format, (double)$2,$3,NCT_ITYPE($1)) && ($2 >= $1_min && $2 <= $1_max)')')dnl
123+
`inRange3(cdf_format, (double)$2,$3,NCT_ITYPE($1)) && ($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
124124
define(`CheckRange',
125-
`ifelse(`$1',`text', `0', `($2 >= $1_min && $2 <= $1_max)')')dnl
125+
`ifelse(`$1',`text', `0', `($2 >= (double)$1_min && $2 <= (double)$1_max)')')dnl
126126
define(`CheckRange3',
127127
`ifelse(`$1',`text', `1',
128128
`inRange3(cdf_format, (double)$2,$3,NCT_ITYPE($1))')')dnl
@@ -145,8 +145,8 @@ hash_$1(const int cdf_format,
145145

146146
value = hash4(cdf_format, type, rank, index, itype);
147147
ifelse(`$1',`text',`return (text)value;',`
148-
if (value > $1_max) return $1_max;
149-
else if (value < $1_min) return $1_min;
148+
if (value > (double)$1_max) return $1_max;
149+
else if (value < (double)$1_min) return $1_min;
150150
else return ($1)value;')
151151
}
152152
')dnl

‎test/nc_test/util.c‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ inRange(const double value, const nc_type xtype)
3434
case NC_UBYTE: return value >= 0 && value <= X_UCHAR_MAX;
3535
case NC_USHORT: return value >= 0 && value <= X_USHORT_MAX;
3636
case NC_UINT: return value >= 0 && value <= X_UINT_MAX;
37-
case NC_INT64: return value >= X_INT64_MIN && value <= X_INT64_MAX;
38-
case NC_UINT64: return value >= 0 && value <= X_UINT64_MAX;
37+
case NC_INT64: return value >= (double)X_INT64_MIN && value <= (double)X_INT64_MAX;
38+
case NC_UINT64: return value >= 0 && value <= (double)X_UINT64_MAX;
3939
default:
4040
assert(0);
4141
return(0);
@@ -94,8 +94,12 @@ inRange_float(const double value, const nc_type xtype)
9494
case NC_UBYTE: min = 0; max = X_UCHAR_MAX; break;
9595
case NC_USHORT: min = 0; max = X_USHORT_MAX; break;
9696
case NC_UINT: min = 0; max = X_UINT_MAX; break;
97-
case NC_INT64: min = X_INT64_MIN; max = X_INT64_MAX; break;
98-
case NC_UINT64: min = 0; max = X_UINT64_MAX; break;
97+
case NC_INT64: min = (double)X_INT64_MIN;
98+
max = (double)X_INT64_MAX;
99+
break;
100+
case NC_UINT64: min = 0;
101+
max = (double)X_UINT64_MAX;
102+
break;
99103
default: assert(0);
100104
}
101105
if (!( value >= min && value <= max)) {
@@ -384,7 +388,7 @@ int dbl2nc ( const double d, const nc_type xtype, void *p)
384388
break;
385389
case NC_INT:
386390
r = floor(0.5+d);
387-
if ( r < long_min || r > long_max ) return 2;
391+
if ( r < (double)long_min || r > (double)long_max ) return 2;
388392
#if INT_MAX >= X_INT_MAX
389393
*((int *) p) = (int)r;
390394
#else
@@ -409,12 +413,12 @@ int dbl2nc ( const double d, const nc_type xtype, void *p)
409413
break;
410414
case NC_INT64:
411415
r = floor(0.5+d);
412-
if ( r < int64_min || r > int64_max ) return 2;
416+
if ( r < (double)int64_min || r > (double)int64_max ) return 2;
413417
*((long long *) p) = (long long)r;
414418
break;
415419
case NC_UINT64:
416420
r = floor(0.5+d);
417-
if ( r < 0.0 || r > uint64_max ) return 2;
421+
if ( r < 0.0 || r > (double)uint64_max ) return 2;
418422
*((unsigned long long *) p) = (unsigned long long)r;
419423
break;
420424
default:

‎test/nf90_test/fortlib.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ FORTRAN_API void FORT_CALL nc_ignorefpe_(int *doit)
128128
/* Else leave name alone */
129129
#endif
130130
FORTRAN_API double FORT_CALL min_schar_(void) {
131-
return SCHAR_MIN;
131+
return (double)SCHAR_MIN;
132132
}
133133

134134
#ifdef F77_NAME_UPPER
@@ -140,7 +140,7 @@ FORTRAN_API double FORT_CALL min_schar_(void) {
140140
/* Else leave name alone */
141141
#endif
142142
FORTRAN_API double FORT_CALL min_short_(void) {
143-
return SHRT_MIN;
143+
return (double)SHRT_MIN;
144144
}
145145

146146
#ifdef F77_NAME_UPPER
@@ -152,7 +152,7 @@ FORTRAN_API double FORT_CALL min_short_(void) {
152152
/* Else leave name alone */
153153
#endif
154154
FORTRAN_API double FORT_CALL min_int_(void) {
155-
return INT_MIN;
155+
return (double)INT_MIN;
156156
}
157157

158158
#ifdef F77_NAME_UPPER
@@ -164,7 +164,7 @@ FORTRAN_API double FORT_CALL min_int_(void) {
164164
/* Else leave name alone */
165165
#endif
166166
FORTRAN_API double FORT_CALL min_int64_(void) {
167-
return INT64_MIN;
167+
return (double)INT64_MIN;
168168
}
169169

170170
#ifdef F77_NAME_UPPER
@@ -176,7 +176,7 @@ FORTRAN_API double FORT_CALL min_int64_(void) {
176176
/* Else leave name alone */
177177
#endif
178178
FORTRAN_API double FORT_CALL max_schar_(void) {
179-
return SCHAR_MAX;
179+
return (double)SCHAR_MAX;
180180
}
181181

182182
#ifdef F77_NAME_UPPER
@@ -188,7 +188,7 @@ FORTRAN_API double FORT_CALL max_schar_(void) {
188188
/* Else leave name alone */
189189
#endif
190190
FORTRAN_API double FORT_CALL max_short_(void) {
191-
return SHRT_MAX;
191+
return (double)SHRT_MAX;
192192
}
193193

194194
#ifdef F77_NAME_UPPER
@@ -200,7 +200,7 @@ FORTRAN_API double FORT_CALL max_short_(void) {
200200
/* Else leave name alone */
201201
#endif
202202
FORTRAN_API double FORT_CALL max_int_(void) {
203-
return INT_MAX;
203+
return (double)INT_MAX;
204204
}
205205

206206
#ifdef F77_NAME_UPPER
@@ -212,7 +212,7 @@ FORTRAN_API double FORT_CALL max_int_(void) {
212212
/* Else leave name alone */
213213
#endif
214214
FORTRAN_API double FORT_CALL max_int64_(void) {
215-
return INT64_MAX;
215+
return (double)INT64_MAX;
216216
}
217217

218218
#ifdef F77_NAME_UPPER
@@ -224,7 +224,7 @@ FORTRAN_API double FORT_CALL max_int64_(void) {
224224
/* Else leave name alone */
225225
#endif
226226
FORTRAN_API double FORT_CALL max_float_(void) {
227-
return FLT_MAX;
227+
return (double)FLT_MAX;
228228
}
229229

230230
#ifdef F77_NAME_UPPER
@@ -236,7 +236,7 @@ FORTRAN_API double FORT_CALL max_float_(void) {
236236
/* Else leave name alone */
237237
#endif
238238
FORTRAN_API double FORT_CALL max_double_(void) {
239-
return DBL_MAX;
239+
return (double)DBL_MAX;
240240
}
241241

242242
#if 0 /* this is implemented in library src now */

‎test/nf_test/fortlib.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ FORTRAN_API void FORT_CALL nc_ignorefpe_(int *doit)
128128
/* Else leave name alone */
129129
#endif
130130
FORTRAN_API double FORT_CALL min_schar_(void) {
131-
return SCHAR_MIN;
131+
return (double)SCHAR_MIN;
132132
}
133133

134134
#ifdef F77_NAME_UPPER
@@ -140,7 +140,7 @@ FORTRAN_API double FORT_CALL min_schar_(void) {
140140
/* Else leave name alone */
141141
#endif
142142
FORTRAN_API double FORT_CALL min_short_(void) {
143-
return SHRT_MIN;
143+
return (double)SHRT_MIN;
144144
}
145145

146146
#ifdef F77_NAME_UPPER
@@ -152,7 +152,7 @@ FORTRAN_API double FORT_CALL min_short_(void) {
152152
/* Else leave name alone */
153153
#endif
154154
FORTRAN_API double FORT_CALL min_int_(void) {
155-
return INT_MIN;
155+
return (double)INT_MIN;
156156
}
157157

158158
#ifdef F77_NAME_UPPER
@@ -176,7 +176,7 @@ FORTRAN_API double FORT_CALL min_int64_(void) {
176176
/* Else leave name alone */
177177
#endif
178178
FORTRAN_API double FORT_CALL max_schar_(void) {
179-
return SCHAR_MAX;
179+
return (double)SCHAR_MAX;
180180
}
181181

182182
#ifdef F77_NAME_UPPER
@@ -188,7 +188,7 @@ FORTRAN_API double FORT_CALL max_schar_(void) {
188188
/* Else leave name alone */
189189
#endif
190190
FORTRAN_API double FORT_CALL max_short_(void) {
191-
return SHRT_MAX;
191+
return (double)SHRT_MAX;
192192
}
193193

194194
#ifdef F77_NAME_UPPER
@@ -200,7 +200,7 @@ FORTRAN_API double FORT_CALL max_short_(void) {
200200
/* Else leave name alone */
201201
#endif
202202
FORTRAN_API double FORT_CALL max_int_(void) {
203-
return INT_MAX;
203+
return (double)INT_MAX;
204204
}
205205

206206
#ifdef F77_NAME_UPPER
@@ -212,7 +212,7 @@ FORTRAN_API double FORT_CALL max_int_(void) {
212212
/* Else leave name alone */
213213
#endif
214214
FORTRAN_API double FORT_CALL max_int64_(void) {
215-
return INT64_MAX;
215+
return (double)INT64_MAX;
216216
}
217217

218218
#ifdef F77_NAME_UPPER
@@ -224,7 +224,7 @@ FORTRAN_API double FORT_CALL max_int64_(void) {
224224
/* Else leave name alone */
225225
#endif
226226
FORTRAN_API double FORT_CALL max_float_(void) {
227-
return FLT_MAX;
227+
return (double)FLT_MAX;
228228
}
229229

230230
#ifdef F77_NAME_UPPER
@@ -236,7 +236,7 @@ FORTRAN_API double FORT_CALL max_float_(void) {
236236
/* Else leave name alone */
237237
#endif
238238
FORTRAN_API double FORT_CALL max_double_(void) {
239-
return DBL_MAX;
239+
return (double)DBL_MAX;
240240
}
241241

242242
#if 0 /* this is implemented in library src now */

0 commit comments

Comments
 (0)