summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-10-14 18:37:36 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-10-14 18:37:36 (GMT)
commita028401448cced890029001070f6f505297e839d (patch)
treead25ef7b99eb0e3953766acccff6676e229df7fd
parent5e7f799ca925e7ca1c99bc9c10c16d1ac6c609fb (diff)
downloadhdf5-a028401448cced890029001070f6f505297e839d.zip
hdf5-a028401448cced890029001070f6f505297e839d.tar.gz
hdf5-a028401448cced890029001070f6f505297e839d.tar.bz2
[svn-r5986] Purpose:
Code cleanup Description: Shift further toward removing the HRETURN* macros, in favor of the HGOTO* macros for error reporting. This change disables them in the header file and is the last change before removing them entirely after the 1.6 release. Platforms tested: FreeBSD 4.6 (sleipnir) w and w/o parallel Linux 2.2.x (eirene) w/FORTRAN & C++ Solaris 2.7 (arabica) w/FORTRAN IRIX64 6.5 (modi4) w/FORTRAN & parallel
-rw-r--r--src/H5Eprivate.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index db7f096..041104e 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -39,6 +39,11 @@
if (H5_IS_API(FUNC) && H5E_auto_g) \
(H5E_auto_g)(H5E_auto_data_g)
+/* Note: if this is still ifdef'ed out and its after the v1.6 release, then
+ * we should be completely free of the necessity for this macro and it can
+ * be removed. -QAK, 9/25/2002
+ */
+#ifdef OLD_WAY
/*
* HRETURN_ERROR macro, used to facilitate error reporting between a
* FUNC_ENTER() and a FUNC_LEAVE() within a function body. The arguments are
@@ -49,6 +54,7 @@
HCOMMON_ERROR (maj, min, str); \
HRETURN(ret_val); \
}
+#endif /* OLD_WAY */
/*
* HDONE_ERROR macro, used to facilitate error reporting between a