diff options
| author | Erik Schnetter <schnetter@aei.mpg.de> | 2005-06-06 16:47:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@aei.mpg.de> | 2005-06-06 16:47:00 +0000 |
| commit | e7c131abbbe1a85cd4be4300bf60b4914cad64fe (patch) | |
| tree | 90821ac4251b497a997d1b863e800c6d86c6cf71 /Carpet/CarpetIOHDF5/src/Output.cc | |
| parent | 06b9583ded526afe3c873e77d251aafacd346712 (diff) | |
CarpetIOHDF5: resolve conflict
darcs-hash:20050606164745-891bb-bfdba5217c624e406550ea12d38969eed76c51ed.gz
Diffstat (limited to 'Carpet/CarpetIOHDF5/src/Output.cc')
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/Output.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Carpet/CarpetIOHDF5/src/Output.cc b/Carpet/CarpetIOHDF5/src/Output.cc index d0766a319..0926abe2c 100644 --- a/Carpet/CarpetIOHDF5/src/Output.cc +++ b/Carpet/CarpetIOHDF5/src/Output.cc @@ -596,7 +596,11 @@ int WriteVarUnchunked (const cGH* const cctkGH, else { hsize_t overlapshape[dim]; +#if (H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 6 && H5_VERS_RELEASE == 4) + hsize_t overlaporigin[dim]; +#else hssize_t overlaporigin[dim]; +#endif for (int d = 0; d < group.dim; ++d) { overlaporigin[group.dim-1-d] = |