summaryrefslogtreecommitdiffstats
path: root/src/H5Ppublic.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-10-12 01:29:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-10-12 01:29:45 (GMT)
commitca0b287d21f4d73bc7d197ee7f6e92ca2631e373 (patch)
tree22153cbcb36f9313fcbe536b47445db2721476cb /src/H5Ppublic.h
parent637fa77ea7e720eb7b5a932ceeb0d05beeefb978 (diff)
downloadhdf5-ca0b287d21f4d73bc7d197ee7f6e92ca2631e373.zip
hdf5-ca0b287d21f4d73bc7d197ee7f6e92ca2631e373.tar.gz
hdf5-ca0b287d21f4d73bc7d197ee7f6e92ca2631e373.tar.bz2
[svn-r14204] Description:
Move H5Pinsert() out of old "compat v1.6" section and into API versioning, switching internal usage to H5Pinsert2(). Add regression test for H5Pinsert1() Clean up some other minor warnings. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'src/H5Ppublic.h')
-rw-r--r--src/H5Ppublic.h22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 5d0c7d3..297798f 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -179,20 +179,10 @@ H5_DLL herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size,
H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t prp_copy,
H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
-#ifdef H5_WANT_H5_V1_6_COMPAT
-H5_DLL herr_t H5Pinsert(hid_t plist_id, const char *name, size_t size,
- void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
- H5P_prp_delete_func_t prp_delete,
- H5P_prp_copy_func_t prp_copy,
- H5P_prp_close_func_t prp_close);
-#else /* H5_WANT_H5_V1_6_COMPAT */
-H5_DLL herr_t H5Pinsert(hid_t plist_id, const char *name, size_t size,
- void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
- H5P_prp_delete_func_t prp_delete,
- H5P_prp_copy_func_t prp_copy,
- H5P_prp_compare_func_t prp_cmp,
- H5P_prp_close_func_t prp_close);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+H5_DLL herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size,
+ void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+ H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+ H5P_prp_compare_func_t prp_cmp, H5P_prp_close_func_t prp_close);
H5_DLL herr_t H5Pset(hid_t plist_id, const char *name, void *value);
H5_DLL htri_t H5Pexist(hid_t plist_id, const char *name);
H5_DLL herr_t H5Pget_size(hid_t id, const char *name, size_t *size);
@@ -426,6 +416,10 @@ H5_DLL herr_t H5Pregister1(hid_t cls_id, const char *name, size_t size,
H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t prp_copy,
H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size,
+ void *value, H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+ H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+ H5P_prp_close_func_t prp_close);
#endif /* H5_NO_DEPRECATED_SYMBOLS */