summaryrefslogtreecommitdiffstats
path: root/c++/test/tarray.cpp
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2021-08-17 19:55:18 (GMT)
committerGitHub <noreply@github.com>2021-08-17 19:55:18 (GMT)
commitc0ef1fd6de3ff20cc8fc49c05ca71254c784bea6 (patch)
treefb2bdf05e276e3614b3b5c343447cd82f4e6718b /c++/test/tarray.cpp
parent2bca2ca6f1ef1b60bb8541413c5f2e68ff5549d3 (diff)
downloadhdf5-c0ef1fd6de3ff20cc8fc49c05ca71254c784bea6.zip
hdf5-c0ef1fd6de3ff20cc8fc49c05ca71254c784bea6.tar.gz
hdf5-c0ef1fd6de3ff20cc8fc49c05ca71254c784bea6.tar.bz2
Reverts PR 906 and 907 due to binary compatibility issues (#918)
Diffstat (limited to 'c++/test/tarray.cpp')
-rw-r--r--c++/test/tarray.cpp31
1 files changed, 15 insertions, 16 deletions
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index 0edfe0e..7525c5f 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -178,9 +178,9 @@ test_array_compound_array()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
- TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
- ", tdims1[%d]=%" PRIuHSIZE "\n",
- ii, rdims1[ii], ii, tdims1[ii]);
+ TestErrPrintf(
+ "Array dimension information doesn't match!, rdims1[%d]=%lld, tdims1[%d]=%lld\n", ii,
+ rdims1[ii], ii, tdims1[ii]);
continue;
} // end if
@@ -197,9 +197,9 @@ test_array_compound_array()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
- TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
- ", tdims1[%d]=%" PRIuHSIZE "\n",
- ii, rdims1[ii], ii, tdims1[ii]);
+ TestErrPrintf(
+ "Array dimension information doesn't match!, rdims1[%d]=%lld, tdims1[%d]=%lld\n", ii,
+ rdims1[ii], ii, tdims1[ii]);
continue;
} // end if
@@ -248,9 +248,9 @@ test_array_compound_array()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
- TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
- ", tdims1[%d]=%" PRIuHSIZE "\n",
- ii, rdims1[ii], ii, tdims1[ii]);
+ TestErrPrintf(
+ "Array dimension information doesn't match!, rdims1[%d]=%lld, tdims1[%d]=%lld\n", ii,
+ rdims1[ii], ii, tdims1[ii]);
continue;
} // end if
@@ -265,9 +265,8 @@ test_array_compound_array()
for (idxi = 0; idxi < SPACE1_DIM1; idxi++) {
for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
if (wdata[idxi][idxj].i != rdata[idxi][idxj].i) {
- TestErrPrintf("Array data information doesn't match!, wdata[%" PRIuHSIZE "][%" PRIuHSIZE
- "].i=%d, "
- "rdata[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d\n",
+ TestErrPrintf("Array data information doesn't match!, wdata[%lld][%lld].i=%d, "
+ "rdata[%lld][%lld].i=%d\n",
idxi, idxj, wdata[idxi][idxj].i, idxi, idxj, rdata[idxi][idxj].i);
continue;
} // end if
@@ -458,11 +457,11 @@ test_array_info()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
- TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%" PRIuHSIZE
- ", tdims1[%d]=%" PRIuHSIZE "\n",
- ii, rdims1[ii], ii, tdims1[ii]);
+ TestErrPrintf(
+ "Array dimension information doesn't match!, rdims1[%d]=%llu, tdims1[%d]=z%llu\n", ii,
+ rdims1[ii], ii, tdims1[ii]);
continue;
- }
+ } // end if
}
// Close all