diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-06-16 17:02:35 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-06-16 17:02:35 (GMT) |
| commit | 4f231ddc9bd1e0b71b4ed7fd0d82e9ca362f942e (patch) | |
| tree | 8721d0bd5f680da3dbb7d15ba33155a3f094ed20 | |
| parent | 4117cfe2b9e19a79e00c5176f354f906235f1b80 (diff) | |
| download | hdf5-4f231ddc9bd1e0b71b4ed7fd0d82e9ca362f942e.zip hdf5-4f231ddc9bd1e0b71b4ed7fd0d82e9ca362f942e.tar.gz hdf5-4f231ddc9bd1e0b71b4ed7fd0d82e9ca362f942e.tar.bz2 | |
[svn-r27214] Fixed a bug on Windows where dcpls were set to be chunked and not virtual. This was due to a simple copy-paste issue in the initializer that is used when C99 initializers are not available.
Also fixed a dims array size error in the vds test.
Tested on: 64-bit Win7 with VS2013
| -rw-r--r-- | src/H5Pdcpl.c | 2 | ||||
| -rw-r--r-- | test/vds.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 5f3e9ef..d17a281 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -198,7 +198,7 @@ static const H5O_layout_t H5D_def_layout_virtual_g = H5D_DEF_LAYOUT_VIRTUAL; static H5O_layout_t H5D_def_layout_compact_g = H5D_DEF_LAYOUT_COMPACT; static H5O_layout_t H5D_def_layout_contig_g = H5D_DEF_LAYOUT_CONTIG; static H5O_layout_t H5D_def_layout_chunk_g = H5D_DEF_LAYOUT_CHUNK; -static H5O_layout_t H5D_def_layout_virtual_g = H5D_DEF_LAYOUT_CHUNK; +static H5O_layout_t H5D_def_layout_virtual_g = H5D_DEF_LAYOUT_VIRTUAL; static hbool_t H5P_dcrt_def_layout_init_g = FALSE; #endif /* H5_HAVE_C99_DESIGNATED_INITIALIZER */ @@ -1001,12 +1001,11 @@ test_basic_io(unsigned config, hid_t fapl) hid_t memspace = -1; /* Memory dataspace */ hid_t srcdset[4] = {-1, -1, -1, -1}; /* Source datsets */ hid_t vdset = -1; /* Virtual dataset */ - hsize_t dims[2] = {10, 26}; /* Data space current size */ + hsize_t dims[4] = {10, 26, -1, -1}; /* Data space current size */ hsize_t start[4]; /* Hyperslab start */ hsize_t stride[4]; /* Hyperslab stride */ hsize_t count[4]; /* Hyperslab count */ hsize_t block[4]; /* Hyperslab block */ - hsize_t coord[10]; /* Point selection array */ int buf[10][26]; /* Write and expected read buffer */ int rbuf[10][26]; /* Read buffer */ int rbuf99[9][9]; /* 9x9 Read buffer */ |