[svn-r15943] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict wi
th user's definition of H5_USE_16_API. The H5_USE_16_API_DEFAULT is defined through configure with the flag --with-default-api-version=v16. Tested with h5committest.
This commit is contained in:
@@ -99,13 +99,13 @@ test_error(hid_t file)
|
||||
TEST_ERROR;
|
||||
if (!old_func)
|
||||
TEST_ERROR;
|
||||
#ifdef H5_USE_16_API
|
||||
#ifdef H5_USE_16_API_DEFAULT
|
||||
if (old_func != (H5E_auto1_t)H5Eprint1)
|
||||
TEST_ERROR;
|
||||
#else /* H5_USE_16_API */
|
||||
#else /* H5_USE_16_API_DEFAULT */
|
||||
if (old_func != (H5E_auto1_t)H5Eprint2)
|
||||
TEST_ERROR;
|
||||
#endif /* H5_USE_16_API */
|
||||
#endif /* H5_USE_16_API_DEFAULT */
|
||||
|
||||
if(H5Eset_auto1(NULL, NULL)<0)
|
||||
TEST_ERROR;
|
||||
|
||||
Reference in New Issue
Block a user