[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:
@@ -86,9 +86,9 @@ sub print_checkoptions ($) {
|
||||
|
||||
# Print the option checking
|
||||
print $fh "\n/* Issue error if contradicting macros have been defined. */\n";
|
||||
print $fh "#if defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS)\n";
|
||||
print $fh "#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS)\n";
|
||||
print $fh "#error \"Can't choose old API versions when deprecated APIs are disabled\"\n";
|
||||
print $fh "#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n";
|
||||
print $fh "#endif /* (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n";
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
|
||||
Reference in New Issue
Block a user