diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2007-02-03 20:30:44 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2007-02-03 20:30:44 (GMT) |
| commit | a7aa86f7d89bbfd31eae159e15860ebbe19e7d03 (patch) | |
| tree | e726a27a7945696697e4a307cec279335e0c99cc /c++/test/tvlstr.cpp | |
| parent | c78a1c555eecc9754224e4b1bb7de4faed66a360 (diff) | |
| download | hdf5-a7aa86f7d89bbfd31eae159e15860ebbe19e7d03.zip hdf5-a7aa86f7d89bbfd31eae159e15860ebbe19e7d03.tar.gz hdf5-a7aa86f7d89bbfd31eae159e15860ebbe19e7d03.tar.bz2 | |
[svn-r13231] Purpose: Clean up C++ tests
Description:
Cleaned up comments/unused variables in several test functions.
Fixed some mismatched type parameters shown up on Windows.
Platforms tested
Windows XP
AIX 5.1 (copper)
Linux 2.6 (kagiso)
Diffstat (limited to 'c++/test/tvlstr.cpp')
| -rw-r--r-- | c++/test/tvlstr.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp index 145c4c8..a719221 100644 --- a/c++/test/tvlstr.cpp +++ b/c++/test/tvlstr.cpp @@ -194,7 +194,7 @@ test_vlstrings_basic(void) str_used+=HDstrlen(wdata[i])+1; // Compare against the strings actually written. - verify_val(vlsize,(hsize_t)str_used,"DataSet::getVlenBufSize", __LINE__, __FILE__); + verify_val((int)vlsize,str_used,"DataSet::getVlenBufSize", __LINE__, __FILE__); // Read dataset from disk. char *rdata[SPACE1_DIM1]; // Information read in @@ -354,10 +354,6 @@ test_vlstrings_special(void) ****************************************************************/ static void test_vlstring_type(void) { - H5T_cset_t cset; - H5T_str_t pad; - herr_t ret; - // Output message about test being performed. MESSAGE(5, ("Testing VL String type\n")); @@ -371,7 +367,7 @@ static void test_vlstring_type(void) // Change padding and verify it. vlstr_type.setStrpad(H5T_STR_NULLPAD); - pad = vlstr_type.getStrpad(); + H5T_str_t pad = vlstr_type.getStrpad(); verify_val(pad, H5T_STR_NULLPAD, "StrType::getStrpad", __LINE__, __FILE__); // Convert to variable-length string. @@ -381,7 +377,7 @@ static void test_vlstring_type(void) H5T_class_t type_class = vlstr_type.getClass(); verify_val(type_class, H5T_STRING, "DataType::getClass", __LINE__, __FILE__); bool is_variable_str = vlstr_type.isVariableStr(); - verify_val(is_variable_str, TRUE, "DataType::isVariableStr", __LINE__, __FILE__); + verify_val(is_variable_str, true, "DataType::isVariableStr", __LINE__, __FILE__); // Check default character set and padding. H5T_cset_t cset = vlstr_type.getCset(); @@ -597,7 +593,6 @@ test_write_vl_string_attribute(void) ****************************************************************/ static void test_read_vl_string_attribute(void) { - herr_t ret; char *string_att_check; try { |