diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2014-04-12 04:02:26 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2014-04-12 04:02:26 (GMT) |
| commit | a791213860bee1a2990a9b502819f17abf7ff8a0 (patch) | |
| tree | eb6a0fb329cf263a781901e4ecfad41809f76fbe /c++/test/tattr.cpp | |
| parent | 170b9d0eed23d84bfad64f216b8759b1dc40586c (diff) | |
| download | hdf5-a791213860bee1a2990a9b502819f17abf7ff8a0.zip hdf5-a791213860bee1a2990a9b502819f17abf7ff8a0.tar.gz hdf5-a791213860bee1a2990a9b502819f17abf7ff8a0.tar.bz2 | |
[svn-r25030] Purpose: Fix HDFFV-8658
Description:
Turned on warnings and removed some of those.
(merged from trunk-r24994)
Platforms tested:
Linux/ppc64 (ostrich)
Linux/32 2.6 (jam)
SunOS 5.11 (emu)
Diffstat (limited to 'c++/test/tattr.cpp')
| -rw-r--r-- | c++/test/tattr.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index 72da288..e333e3f 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -292,7 +292,8 @@ static void test_attr_getname() HDmemset(fattr1_name, 0, buf_size+1); ssize_t name_size = 0; // actual length of attribute name name_size = fattr1.getName(fattr1_name, buf_size+1); - verify_val(name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__); + CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); + verify_val((size_t)name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__); verify_val((const char*)fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__); delete []fattr1_name; @@ -303,7 +304,8 @@ static void test_attr_getname() fattr1_name = new char[buf_size+1]; HDmemset(fattr1_name, 0, buf_size+1); name_size = fattr1.getName(fattr1_name, buf_size+1); - verify_val(name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__); + CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); + verify_val((size_t)name_size, FATTR1_NAME.size(), "Attribute::getName", __LINE__, __FILE__); verify_val((const char*)fattr1_name, (const char*)short_name, "Attribute::getName", __LINE__, __FILE__); delete []fattr1_name; @@ -312,6 +314,7 @@ static void test_attr_getname() fattr1_name = new char[buf_size+1]; HDmemset(fattr1_name, 0, buf_size+1); name_size = fattr1.getName(fattr1_name, buf_size+1); + CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__); delete []fattr1_name; @@ -609,7 +612,7 @@ static void test_attr_compound_read() size_t size; // Attribute datatype size as stored in file size_t offset; // Attribute datatype field offset struct attr4_struct read_data4[ATTR4_DIM1][ATTR4_DIM2]; // Buffer for reading 4th attribute - int i,j; + hsize_t i,j; // Output message about test being performed SUBTEST("Basic Attribute Functions"); |