diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-23 19:32:29 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:37:19 (GMT) |
commit | 117ead60a31009f034a6bdb9cca1b031048c2502 (patch) | |
tree | 0646d8bb37489efbbe8b5d64c887296187d9d590 /c++ | |
parent | 68e1561d8778ad120b553c6fd1927e3319a3c989 (diff) | |
download | hdf5-117ead60a31009f034a6bdb9cca1b031048c2502.zip hdf5-117ead60a31009f034a6bdb9cca1b031048c2502.tar.gz hdf5-117ead60a31009f034a6bdb9cca1b031048c2502.tar.bz2 |
TRILAB-244 separate CXX warnings and errors from C
Diffstat (limited to 'c++')
-rw-r--r-- | c++/test/tarray.cpp | 1 | ||||
-rw-r--r-- | c++/test/tobject.cpp | 4 | ||||
-rw-r--r-- | c++/test/ttypes.cpp | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp index f079780..d80de16 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 fd0f5ce..9b5dd68 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 @@ -542,7 +542,7 @@ const H5std_string GROUP1NAME("group1"); const H5std_string GROUP2NAME("group2"); static void test_getobjectinfo_same_file() { - H5O_info2_t oinfo1, oinfo2; /* Object info structs */ + H5O_info2_t oinfo1, oinfo2; /* Object info structs */ // Output message about test being performed SUBTEST("Group::getObjinfo"); diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index ae79653..b8846f4 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; |