summaryrefslogtreecommitdiffstats
path: root/src/H5Epublic.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-01-13 13:15:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-01-13 13:15:49 (GMT)
commit8e391ad35a1ede1ac046f05710297aa40986642b (patch)
tree247faeeacb9925beb90b6b8c10f0d875f93ed155 /src/H5Epublic.h
parentc3a1173026916e25a5a44f1d4255b889ccbaeb2b (diff)
downloadhdf5-8e391ad35a1ede1ac046f05710297aa40986642b.zip
hdf5-8e391ad35a1ede1ac046f05710297aa40986642b.tar.gz
hdf5-8e391ad35a1ede1ac046f05710297aa40986642b.tar.bz2
[svn-r6269] Purpose:
Code cleanup Description: Various code cleanups to allow the development branch to be compiled with a C++ compiler (i.e. CC=g++ ) Platforms tested: Tested h5committest {arabica (fortran), eirene (fortran, C++) modi4 (parallel, fortran)} FreeBSD 4.7 (sleipnir) C++
Diffstat (limited to 'src/H5Epublic.h')
-rw-r--r--src/H5Epublic.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 607bbf2..c6ab38a 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -39,7 +39,7 @@
* the error reporting won't be properly restored!
*/
#define H5E_BEGIN_TRY { \
- herr_t (*H5E_saved_efunc)(void*); \
+ H5E_auto_t H5E_saved_efunc; \
void *H5E_saved_edata; \
H5Eget_auto (&H5E_saved_efunc, &H5E_saved_edata); \
H5Eset_auto (NULL, NULL);
@@ -225,14 +225,14 @@ typedef enum H5E_direction_t {
H5E_WALK_DOWNWARD = 1 /*begin at API function, end deep */
} H5E_direction_t;
-/* Error stack traversal callback function */
-typedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void *client_data);
-typedef herr_t (*H5E_auto_t)(void *client_data);
-
#ifdef __cplusplus
extern "C" {
#endif
+/* Error stack traversal callback function */
+typedef herr_t (*H5E_walk_t)(int n, H5E_error_t *err_desc, void *client_data);
+typedef herr_t (*H5E_auto_t)(void *client_data);
+
H5_DLL herr_t H5Eset_auto (H5E_auto_t func, void *client_data);
H5_DLL herr_t H5Eget_auto (H5E_auto_t *func, void **client_data);
H5_DLL herr_t H5Eclear (void);