diff options
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/H5Attribute.cpp | 2 | ||||
| -rw-r--r-- | c++/src/H5CommonFG.cpp | 4 | ||||
| -rw-r--r-- | c++/test/dsets.cpp | 4 | ||||
| -rw-r--r-- | c++/test/tfilter.cpp | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp index ed2e7f3..fe2527b 100644 --- a/c++/src/H5Attribute.cpp +++ b/c++/src/H5Attribute.cpp @@ -162,7 +162,7 @@ void Attribute::read( const DataType& mem_type, H5std_string& strg ) const void *ptr; if (!is_variable_len) // only allocate for fixed-len string { - strg_C = new char [attr_size+1]; + strg_C = new char [(size_t)attr_size+1]; ptr = strg_C; } else diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp index 0217df2..f70e0d1 100644 --- a/c++/src/H5CommonFG.cpp +++ b/c++/src/H5CommonFG.cpp @@ -541,11 +541,11 @@ H5std_string CommonFG::getComment (const H5std_string& name) const // temporary C-string for the object's comment char* comment_C = new char[bufsize+1]; - herr_t ret_value = H5Oget_comment_by_name(loc_id, name.c_str(), comment_C, bufsize, H5P_DEFAULT); + ssize_t ret_value = H5Oget_comment_by_name(loc_id, name.c_str(), comment_C, bufsize, H5P_DEFAULT); // if the actual length of the comment is longer than the anticipated // value, then call H5Oget_comment_by_name again with the correct value - if (ret_value > bufsize) + if ((size_t)ret_value > bufsize) { bufsize = ret_value; delete []comment_C; diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 652149e..603a0aa 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -423,7 +423,7 @@ test_compression(H5File& file) for (i = n = 0; i < 100; i++) { for (j = 0; j < 200; j++) { - points[i][j] = n++; + points[i][j] = (int)n++; } } char* tconv_buf = new char [1000]; @@ -487,7 +487,7 @@ test_compression(H5File& file) { for (j=0; j<size[1]; j++) { - points[i][j] = n++; + points[i][j] = (int)n++; } } diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp index 1774cf2..db7e358 100644 --- a/c++/test/tfilter.cpp +++ b/c++/test/tfilter.cpp @@ -118,7 +118,7 @@ static void test_null_filter() // Output message about test being performed SUBTEST("'Null' filter"); try { - hsize_t null_size; // Size of dataset with null filter + //hsize_t null_size; // Size of dataset with null filter // Prepare dataset create property list DSetCreatPropList dsplist; @@ -168,7 +168,6 @@ void test_szip_filter(H5File& file1) { #ifdef H5_HAVE_FILTER_SZIP int points[DSET_DIM1][DSET_DIM2], check[DSET_DIM1][DSET_DIM2]; - hsize_t szip_size; /* Size of dataset with szip filter */ unsigned szip_options_mask=H5_SZIP_NN_OPTION_MASK; unsigned szip_pixels_per_block=4; @@ -203,7 +202,7 @@ void test_szip_filter(H5File& file1) { for (j=0; j<size[1]; j++) { - points[i][j] = n++; + points[i][j] = (int)n++; } } |