diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-27 17:10:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-27 17:10:30 (GMT) |
| commit | c034efb0e2be94627d8c97b488f3b1d18a23ff2f (patch) | |
| tree | a7ba7522260e5362cebe59f7d2cd3216d4a14012 /c++ | |
| parent | 844400155918e931b16b69c59b8b76d4121005ac (diff) | |
| parent | 68adfb86d056af222ab80c349c56e0bd1d183f09 (diff) | |
| download | hdf5-c034efb0e2be94627d8c97b488f3b1d18a23ff2f.zip hdf5-c034efb0e2be94627d8c97b488f3b1d18a23ff2f.tar.gz hdf5-c034efb0e2be94627d8c97b488f3b1d18a23ff2f.tar.bz2 | |
Merge pull request #2529 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '68adfb86d056af222ab80c349c56e0bd1d183f09':
Merge pull request #2537 in HDFFV/hdf5 from ~DYOUNG/werror:fix-werrors to develop
Move ADD_H5_FLAGS macro from *CompilerFlags.cmake files to config/cmake_ext_mod/HDFMacros.cmake for common use.
Restrict errors to gcc 4.8 and above.
Fix NoFilter build
TRILAB-244 separate CXX warnings and errors from C
Don't add general warnings flags for unsupported old versions of gcc and g++ (older than gcc/g++ 4.2). Correct gnu-cxxflags to determine warnings flags to be added based on C++ compiler version instead of C compiler version.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/test/tarray.cpp | 1 | ||||
| -rw-r--r-- | c++/test/tobject.cpp | 2 | ||||
| -rw-r--r-- | c++/test/ttypes.cpp | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp index fccc556..69c58f8 100644 --- a/c++/test/tarray.cpp +++ b/c++/test/tarray.cpp @@ -368,7 +368,6 @@ static void test_array_info() float f[ARRAY1_DIM1]; } s1_t; s1_t wdata[SPACE1_DIM1][ARRAY1_DIM1]; // Information to write - s1_t rdata[SPACE1_DIM1][ARRAY1_DIM1]; // Information read in hsize_t sdims1[] = {SPACE1_DIM1}; hsize_t tdims1[] = {ARRAY1_DIM1}; int ii; // counting variables diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp index 232ece2..138c4ca 100644 --- a/c++/test/tobject.cpp +++ b/c++/test/tobject.cpp @@ -430,7 +430,6 @@ const H5std_string DSETNAME("dataset"); static void test_open_object_header() { hsize_t dims[2]; - H5G_info_t ginfo; /* Group info struct */ // Output message about test being performed SUBTEST("Group::getObjId"); @@ -485,6 +484,7 @@ static void test_open_object_header() dset.setId(obj_dset); dspace = dset.getSpace(); bool is_simple = dspace.isSimple(); + verify_val(is_simple, true, "isSimple", __LINE__, __FILE__); dspace.close(); // Open datatype object from the group diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index 0de66d7..81ad983 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -403,7 +403,7 @@ static void test_vltype() // Verify that the copied type has a valid id bool is_valid = IdComponent::isValid(vltype2.getId()); - verify_val(in_class, true, "isValid on vltype2", __LINE__, __FILE__); + verify_val(is_valid, true, "isValid on vltype2", __LINE__, __FILE__); in_class = vltype2.detectClass(H5T_VLEN); verify_val(in_class, true, "VarLenType::detectClass() with H5T_VLEN for vltype2", __LINE__, __FILE__); @@ -1010,8 +1010,8 @@ static void test_encode_decode() FloatType decoded_flttyp(decoded_flt_ptr->getId()); verify_val(flttyp == decoded_flttyp, true, "DataType::decode", __LINE__, __FILE__); - H5std_string norm_string; - H5T_norm_t mant_norm = decoded_flttyp.getNorm(norm_string); + //H5std_string norm_string; + //H5T_norm_t mant_norm = decoded_flttyp.getNorm(norm_string); //verify_val(decoded_flttyp.isVariableStr(), true, "DataType::decode", __LINE__, __FILE__); delete decoded_flt_ptr; |