diff options
Diffstat (limited to 'src/H5D.c')
| -rw-r--r-- | src/H5D.c | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -1340,11 +1340,6 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert from file to memory data space"); } -<<<<<<< H5D.c -#ifdef QAK - printf("%s: check 1.0\n",FUNC); -#endif /* QAK */ - #ifdef HAVE_PARALLEL /* rky 980813 This is a temporary KLUGE. * The sconv functions should be set by H5S_find, @@ -1353,12 +1348,9 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, * (the latter in case the arguments to sconv_funcs * turn out to be inappropriate for MPI-IO). */ if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO) { - sconv_func.read = H5S_mpio_spaces_read; + sconv->read = H5S_mpio_spaces_read; } #endif /*HAVE_PARALLEL*/ - -======= ->>>>>>> 1.113 /* * If there is no type conversion then try reading directly into the @@ -1694,11 +1686,6 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert from memory to file data space"); } -<<<<<<< H5D.c -#ifdef QAK - printf("%s: check 1.0\n",FUNC); -#endif /* QAK */ - #ifdef HAVE_PARALLEL /* rky 980813 This is a temporary KLUGE. * The sconv functions should be set by H5S_find, @@ -1707,13 +1694,10 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, * (the latter in case the arguments to sconv_funcs * turn out to be inappropriate for MPI-IO). */ if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO) { - sconv_func.write = H5S_mpio_spaces_write; + sconv->write = H5S_mpio_spaces_write; } #endif /*HAVE_PARALLEL*/ -======= - ->>>>>>> 1.113 /* * If there is no type conversion then try writing directly from * application buffer to file. |