diff options
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/test/dsets.cpp | 6 | ||||
| -rw-r--r-- | c++/test/tfile.cpp | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 3f0dec5..0930451 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -58,7 +58,7 @@ const H5std_string DSET_BOGUS_NAME ("bogus"); const int H5Z_FILTER_BOGUS = 305; // Local prototypes -static size_t bogus(unsigned int flags, size_t cd_nelmts, +static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf); void cleanup_dsets(void); @@ -394,7 +394,7 @@ const H5Z_class_t H5Z_BOGUS[1] = {{ "bogus", /* Filter name for debugging */ NULL, /* The "can apply" callback */ NULL, /* The "set local" callback */ - bogus, /* The actual filter function */ + (H5Z_func_t)filter_bogus, /* The actual filter function */ }}; /*------------------------------------------------------------------------- @@ -418,7 +418,7 @@ static size_t const unsigned int UNUSED cd_values[], size_t nbytes, size_t UNUSED *buf_size, void UNUSED **buf) BMR: removed UNUSED for now until asking Q. or R. to pass compilation*/ -bogus(unsigned int flags, size_t cd_nelmts, +filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[], size_t nbytes, size_t *buf_size, void **buf) { diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index d68031a..3b197f2 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -111,6 +111,7 @@ test_file_create(void) // try to create the same file with H5F_ACC_TRUNC. This should fail // because file1 is the same file and is currently open. +#ifndef H5_HAVE_FILE_VERSIONS try { H5File file2 (FILE1, H5F_ACC_TRUNC); // should throw E @@ -119,7 +120,7 @@ test_file_create(void) } catch( FileIException E ) // catch truncating existing file {} // do nothing, FAIL expected - +#endif // Close file1 delete file1; file1 = NULL; @@ -134,7 +135,7 @@ test_file_create(void) } catch( FileIException E ) // catching creating existing file {} // do nothing, FAIL expected - +#ifndef H5_HAVE_FILE_VERSIONS // Test create with H5F_ACC_TRUNC. This will truncate the existing file. file1 = new H5File (FILE1, H5F_ACC_TRUNC); @@ -148,7 +149,7 @@ test_file_create(void) } catch( FileIException E ) // catching truncating opened file {} // do nothing, FAIL expected - +#endif // Try with H5F_ACC_EXCL. This should fail too because the file already // exists. try { |