mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[svn-r6686]
Purpose: Windows port Description: Windows cannot convert from _uint64_t to double. One of the tests (test_set_local) used conversion to fill a data buffer. Compilation failed on Windows. Solution: Fixed the code not to use conversion Platforms tested: CRAY T90IEEE, arabica, modi4 with parallel, Windows 2000 Only static tests (both debug and release) passed on Windows. DLLs have multiple problems ;-) Misc. update:
This commit is contained in:
parent
0d5bd9fe3a
commit
b2a0a50eb1
@ -2382,7 +2382,8 @@ test_set_local(const char *filename, hid_t fapl)
|
|||||||
const hsize_t chunk_dims[2] = {2, 25}; /* Chunk dimensions */
|
const hsize_t chunk_dims[2] = {2, 25}; /* Chunk dimensions */
|
||||||
hsize_t dset_size; /* Dataset size */
|
hsize_t dset_size; /* Dataset size */
|
||||||
unsigned cd_values[2]={BOGUS2_PARAM_1, BOGUS2_PARAM_2}; /* Parameters for Bogus2 filter */
|
unsigned cd_values[2]={BOGUS2_PARAM_1, BOGUS2_PARAM_2}; /* Parameters for Bogus2 filter */
|
||||||
hsize_t i,j,n; /* Local index variables */
|
hsize_t i,j; /* Local index variables */
|
||||||
|
double n; /* Local index variables */
|
||||||
|
|
||||||
TESTING("dataset filter 'set local' callback");
|
TESTING("dataset filter 'set local' callback");
|
||||||
|
|
||||||
@ -2390,7 +2391,7 @@ test_set_local(const char *filename, hid_t fapl)
|
|||||||
for (i = n = 0; i < 100; i++)
|
for (i = n = 0; i < 100; i++)
|
||||||
for (j = 0; j < 200; j++) {
|
for (j = 0; j < 200; j++) {
|
||||||
points[i][j] = n++;
|
points[i][j] = n++;
|
||||||
points_dbl[i][j] = (double)1.5*(double)n++;
|
points_dbl[i][j] = (double)1.5*n++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Open file */
|
/* Open file */
|
||||||
|
Loading…
Reference in New Issue
Block a user