summaryrefslogtreecommitdiffstats
path: root/src/H5version.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5version.h')
-rw-r--r--src/H5version.h140
1 files changed, 16 insertions, 124 deletions
diff --git a/src/H5version.h b/src/H5version.h
index 34f961e..7326a53 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -18,18 +18,12 @@
#ifndef _H5version_H
#define _H5version_H
-/* Issue error if contradicting macros have been defined. */
-#if (defined(H5_USE_16_API) || defined(H5_USE_18_API) || defined(H5_USE_110_API)) && 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_USE_18_API) || defined(H5_USE_110_API)) && defined(H5_NO_DEPRECATED_SYMBOLS) */
-
-/* If a particular "global" version of the library's interfaces is chosen,
- * set the versions for the API symbols affected.
+/* If a particular default "global" version of the library's interfaces is
+ * chosen, set the corresponding version macro for API symbols.
*
- * Note: If an application has already chosen a particular version for an
- * API symbol, the individual API version macro takes priority.
*/
+
#if defined(H5_USE_16_API_DEFAULT) && !defined(H5_USE_16_API)
#define H5_USE_16_API 1
#endif /* H5_USE_16_API_DEFAULT && !H5_USE_16_API */
@@ -38,10 +32,20 @@
#define H5_USE_18_API 1
#endif /* H5_USE_18_API_DEFAULT && !H5_USE_18_API */
-#if defined(H5_USE_110_API_DEFAULT) && !defined(H5_USE_110_API)
- #define H5_USE_110_API 1
-#endif /* H5_USE_110_API_DEFAULT && !H5_USE_110_API */
+/* Issue error if contradicting macros have been defined. */
+/* (Can't use an older (deprecated) API version if deprecated symbols have been disabled) */
+#if (defined(H5_USE_16_API) || defined(H5_USE_18_API)) && 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_USE_18_API)) && defined(H5_NO_DEPRECATED_SYMBOLS) */
+
+
+/* If a particular "global" version of the library's interfaces is chosen,
+ * set the versions for the API symbols affected.
+ *
+ * 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
@@ -263,118 +267,6 @@
#endif /* H5_USE_18_API */
-#ifdef H5_USE_110_API
-
-/*************/
-/* Functions */
-/*************/
-
-#if !defined(H5Acreate_vers)
- #define H5Acreate_vers 2
-#endif /* !defined(H5Acreate_vers) */
-
-#if !defined(H5Aiterate_vers)
- #define H5Aiterate_vers 2
-#endif /* !defined(H5Aiterate_vers) */
-
-#if !defined(H5Dcreate_vers)
- #define H5Dcreate_vers 2
-#endif /* !defined(H5Dcreate_vers) */
-
-#if !defined(H5Dopen_vers)
- #define H5Dopen_vers 2
-#endif /* !defined(H5Dopen_vers) */
-
-#if !defined(H5Eclear_vers)
- #define H5Eclear_vers 2
-#endif /* !defined(H5Eclear_vers) */
-
-#if !defined(H5Eget_auto_vers)
- #define H5Eget_auto_vers 2
-#endif /* !defined(H5Eget_auto_vers) */
-
-#if !defined(H5Eprint_vers)
- #define H5Eprint_vers 2
-#endif /* !defined(H5Eprint_vers) */
-
-#if !defined(H5Epush_vers)
- #define H5Epush_vers 2
-#endif /* !defined(H5Epush_vers) */
-
-#if !defined(H5Eset_auto_vers)
- #define H5Eset_auto_vers 2
-#endif /* !defined(H5Eset_auto_vers) */
-
-#if !defined(H5Ewalk_vers)
- #define H5Ewalk_vers 2
-#endif /* !defined(H5Ewalk_vers) */
-
-#if !defined(H5Fget_info_vers)
- #define H5Fget_info_vers 2
-#endif /* !defined(H5Fget_info_vers) */
-
-#if !defined(H5Gcreate_vers)
- #define H5Gcreate_vers 2
-#endif /* !defined(H5Gcreate_vers) */
-
-#if !defined(H5Gopen_vers)
- #define H5Gopen_vers 2
-#endif /* !defined(H5Gopen_vers) */
-
-#if !defined(H5Pget_filter_vers)
- #define H5Pget_filter_vers 2
-#endif /* !defined(H5Pget_filter_vers) */
-
-#if !defined(H5Pget_filter_by_id_vers)
- #define H5Pget_filter_by_id_vers 2
-#endif /* !defined(H5Pget_filter_by_id_vers) */
-
-#if !defined(H5Pinsert_vers)
- #define H5Pinsert_vers 2
-#endif /* !defined(H5Pinsert_vers) */
-
-#if !defined(H5Pregister_vers)
- #define H5Pregister_vers 2
-#endif /* !defined(H5Pregister_vers) */
-
-#if !defined(H5Rdereference_vers)
- #define H5Rdereference_vers 2
-#endif /* !defined(H5Rdereference_vers) */
-
-#if !defined(H5Rget_obj_type_vers)
- #define H5Rget_obj_type_vers 2
-#endif /* !defined(H5Rget_obj_type_vers) */
-
-#if !defined(H5Tarray_create_vers)
- #define H5Tarray_create_vers 2
-#endif /* !defined(H5Tarray_create_vers) */
-
-#if !defined(H5Tcommit_vers)
- #define H5Tcommit_vers 2
-#endif /* !defined(H5Tcommit_vers) */
-
-#if !defined(H5Tget_array_dims_vers)
- #define H5Tget_array_dims_vers 2
-#endif /* !defined(H5Tget_array_dims_vers) */
-
-#if !defined(H5Topen_vers)
- #define H5Topen_vers 2
-#endif /* !defined(H5Topen_vers) */
-
-/************/
-/* Typedefs */
-/************/
-
-#if !defined(H5E_auto_t_vers)
- #define H5E_auto_t_vers 2
-#endif /* !defined(H5E_auto_t_vers) */
-
-#if !defined(H5Z_class_t_vers)
- #define H5Z_class_t_vers 2
-#endif /* !defined(H5Z_class_t_vers) */
-
-#endif /* H5_USE_110_API */
-
/* Choose the correct version of each API symbol, defaulting to the latest
* version of each. The "best" name for API parameters/data structures