mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-28 04:09:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r15943] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict wi

Browse Source 
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:
Raymond Lu
2008-10-24 14:12:21 -05:00
parent a664274624
commit 5deed723e5
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/make_vers
+2 -2
View File
@@ -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";
}
##############################################################################
configure
Vendored
+1 -1
View File
@@ -51131,7 +51131,7 @@ echo "${ECHO_T}v16" >&6; }
DEFAULT_API_VERSION=v16
cat >>confdefs.h <<\_ACEOF
#define USE_16_API 1
#define USE_16_API_DEFAULT 1
_ACEOF
elif test "X$withval" = "Xv18"; then
configure.in
+1 -1
View File
@@ -3753,7 +3753,7 @@ AC_ARG_WITH([default-api-version],
if test "X$withval" = "Xv16"; then
AC_MSG_RESULT([v16])
DEFAULT_API_VERSION=v16
AC_DEFINE([USE_16_API], [1],
AC_DEFINE([USE_16_API_DEFAULT], [1],
[Define using v1.6 public API symbols by default])
elif test "X$withval" = "Xv18"; then
AC_MSG_RESULT([v18])
examples/testh5cc.sh.in
+1 -1
View File
@@ -134,7 +134,7 @@ main (void)
printf("HDF5 C Sample program ran successfully. File %s generated.\n", H5FILE_NAME);
remove(H5FILE_NAME);
return 0;
}
EOF
src/H5E.c
+3 -3
View File
@@ -170,13 +170,13 @@ H5E_set_default_auto(H5E_t *stk)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_default_auto)
#ifdef H5_USE_16_API
#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)
stk->auto_op.vers = 1;
stk->auto_op.u.func1 = (H5E_auto1_t)H5Eprint1;
#else /* H5_USE_16_API */
#else /* H5_USE_16_API || H5_USE_16_API_DEFAULT */
stk->auto_op.vers = 2;
stk->auto_op.u.func2 = (H5E_auto2_t)H5Eprint2;
#endif /* H5_USE_16_API */
#endif /* H5_USE_16_API || H5_USE_16_API_DEFAULT */
stk->auto_data = NULL;
FUNC_LEAVE_NOAPI(SUCCEED)
src/H5config.h.in
+1 -1
View File
@@ -609,7 +609,7 @@
#undef ULONG_TO_FP_BOTTOM_BIT_ACCURATE
/* Define using v1.6 public API symbols by default */
#undef USE_16_API
#undef USE_16_API_DEFAULT
/* Define if a memory checking tool will be used on the library, to cause
library to be very picky about memory operations and also disable the
src/H5version.h
+4 -4
View File
@@ -21,9 +21,9 @@
#define _H5version_H
/* Issue error if contradicting macros have been defined. */
#if defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS)
#if (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS)
#error "Can't choose old API versions when deprecated APIs are disabled"
#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */
#endif /* (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */
/* If a particular "global" version of the library's interfaces is chosen,
@@ -32,7 +32,7 @@
* Note: If an application has already chosen a particular version for an
* API symbol, the individual API version macro takes priority.
*/
#ifdef H5_USE_16_API
#ifdef H5_USE_16_API_DEFAULT
/*************/
/* Functions */
@@ -130,7 +130,7 @@
#define H5E_auto_t_vers 1
#endif /* !defined(H5E_auto_t_vers) */
#endif /* H5_USE_16_API */
#endif /* H5_USE_16_API_DEFAULT */
/* Choose the correct version of each API symbol, defaulting to the latest
test/err_compat.c
+3 -3
View File
@@ -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;
test/error_test.c
+6 -6
View File
@@ -21,13 +21,13 @@
*/
#include "h5test.h"
#ifdef H5_USE_16_API
#ifdef H5_USE_16_API_DEFAULT
int main(void)
{
printf("Test skipped because backward compatbility with v1.6 is configured in\n");
return 0;
}
#else /* H5_USE_16_API */
#else /* H5_USE_16_API_DEFAULT */
const char *FILENAME[] = {
"errors",
@@ -129,13 +129,13 @@ test_error(hid_t file)
TEST_ERROR;
if(old_data != NULL)
TEST_ERROR;
#ifdef H5_USE_16_API
#ifdef H5_USE_16_API_DEFAULT
if (old_func != (H5E_auto_t)H5Eprint)
TEST_ERROR;
#else /* H5_USE_16_API */
#else /* H5_USE_16_API_DEFAULT */
if (old_func != (H5E_auto2_t)H5Eprint2)
TEST_ERROR;
#endif /* H5_USE_16_API */
#endif /* H5_USE_16_API_DEFAULT */
if(H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0)
TEST_ERROR;
@@ -620,5 +620,5 @@ error:
printf("***** ERROR TEST FAILED! *****\n");
return 1;
}
#endif /* H5_USE_16_API */
#endif /* H5_USE_16_API_DEFAULT */
windows/src/H5pubconf.h
+1 -1
View File
@@ -630,7 +630,7 @@
/* #undef H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE */
/* Define using v1.6 public API symbols by default */
/* #undef H5_USE_16_API */
/* #undef H5_USE_16_API_DEFAULT */
/* Define if a memory checking tool will be used on the library, to cause
library to be very picky about memory operations and also disable the