From 4f231ddc9bd1e0b71b4ed7fd0d82e9ca362f942e Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 16 Jun 2015 12:02:35 -0500 Subject: [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 --- src/H5Pdcpl.c | 2 +- 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 */ diff --git a/test/vds.c b/test/vds.c index 08df7ef..f39136d 100644 --- a/test/vds.c +++ b/test/vds.c @@ -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 */ -- cgit v0.12