diff options
author | Sean McBride <sean@rogue-research.com> | 2021-03-04 21:06:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 21:06:30 (GMT) |
commit | 580008d5bb39e3a9a4a92aefe06dce6941cd485b (patch) | |
tree | 449ff31910ac3efa9307c932b5f93f354ff14e94 /c++/test/tarray.cpp | |
parent | fb210fc4fd70ce68b95a08f91eee2580552b6d21 (diff) | |
download | hdf5-580008d5bb39e3a9a4a92aefe06dce6941cd485b.zip hdf5-580008d5bb39e3a9a4a92aefe06dce6941cd485b.tar.gz hdf5-580008d5bb39e3a9a4a92aefe06dce6941cd485b.tar.bz2 |
More warning fixes (#400)
* Fixed -Wunused-local-typedef warning
* Fixed -Wformat warnings
In one case also removed a `z` character. There was a `z%d` that I think was supposed to be `%zd`
* Fixed -Wshorten-64-to-32 warnings
* Fixed -Wself-assign warnings
* Fixed -Wreserved-id-macro warnings
* Commit format changes from clang-format, clang version 10.0.1.
* Fixed -Wself-assign warnings
* Fixed -Wunused-local-typedef warning
* Fixed -Wformat warnings
In two cases also removed a `z` character. There was a `z%d` that was supposed to be `%zd`.
* Fixed -Wshorten-64-to-32 warnings
* Fixed -Wreserved-id-macro warnings
* Fixed -Wself-assign warnings
* Format source.
* Remove blank lines to pass format check.
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Diffstat (limited to 'c++/test/tarray.cpp')
-rw-r--r-- | c++/test/tarray.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp index ba71da8..ab66174 100644 --- a/c++/test/tarray.cpp +++ b/c++/test/tarray.cpp @@ -85,7 +85,7 @@ test_array_compound_array() // Initialize array data to write for (idxi = 0; idxi < SPACE1_DIM1; idxi++) for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) { - wdata[idxi][idxj].i = idxi * 10 + idxj; + wdata[idxi][idxj].i = static_cast<int>(idxi * 10 + idxj); for (idxk = 0; idxk < ARRAY1_DIM1; idxk++) { float temp = idxi * 10.0 + idxj * 2.5 + idxk; wdata[idxi][idxj].f[idxk] = temp; @@ -182,8 +182,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]=%zd, tdims1[%d]=z%d\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 @@ -200,8 +201,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]=%zd, tdims1[%d]=%zd\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 @@ -250,8 +252,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]=%zd, tdims1[%d]=%zd\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 @@ -266,9 +269,9 @@ 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[%d][%d].i=%d, rdata[%d][%d].i=%d\n", - idxi, idxj, wdata[idxi][idxj].i, idxi, idxj, rdata[idxi][idxj].i); + 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 } // end for @@ -387,7 +390,7 @@ test_array_info() // Initialize array data to write for (idxi = 0; idxi < SPACE1_DIM1; idxi++) for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) { - wdata[idxi][idxj].i = idxi * 10 + idxj; + wdata[idxi][idxj].i = static_cast<int>(idxi * 10 + idxj); for (idxk = 0; idxk < ARRAY1_DIM1; idxk++) { float temp = idxi * 10.0 + idxj * 2.5 + idxk; wdata[idxi][idxj].f[idxk] = temp; @@ -459,7 +462,7 @@ test_array_info() for (ii = 0; ii < ndims; ii++) if (rdims1[ii] != tdims1[ii]) { TestErrPrintf( - "Array dimension information doesn't match!, rdims1[%d]=%zd, tdims1[%d]=z%d\n", ii, + "Array dimension information doesn't match!, rdims1[%d]=%llu, tdims1[%d]=z%llu\n", ii, rdims1[ii], ii, tdims1[ii]); continue; } // end if |