summaryrefslogtreecommitdiffstats
path: root/c++/src/H5IdComponent.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2012-03-30 19:34:20 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2012-03-30 19:34:20 (GMT)
commit56d950d3264aae3d935854470a9178a333614bff (patch)
treee74485f6148c1c598b9961556820f7ddec7444f3 /c++/src/H5IdComponent.cpp
parent7f7b8bd9725854fc8b546bcde3252f2c8d5c5d32 (diff)
downloadhdf5-56d950d3264aae3d935854470a9178a333614bff.zip
hdf5-56d950d3264aae3d935854470a9178a333614bff.tar.gz
hdf5-56d950d3264aae3d935854470a9178a333614bff.tar.bz2
[svn-r22209] Purpose: Fixed bugs HDFFV-2761 & HDFFV-7852
Description: - Replaced PredType::NotAtexit() with PredType::AtExit(H5CPP_EXITED) and used PredType::AtExit as a flag to detect when all predefined types have been destroyed. Then, H5close will be called to terminate the library after its being re-initiated when the PredType destructors were activated. This change removed the memory leaks shown by the user's sample program in HDFFV-2761. - Added H5CPP_EXITED for PredType::AtExit to use as a flag - Rearranged constructors in CompType to fix bug HDFFV-7852 - Updated some inaccurate comments - Removed stream functions from FileAccPropList - Replaced H5_VMS with appropriate macro in H5IdComponent.cpp Platforms tested: Linux/32 2.6 (jam) Linux/64 2.6 (amani) SunOS 5.10 (linew)
Diffstat (limited to 'c++/src/H5IdComponent.cpp')
-rw-r--r--c++/src/H5IdComponent.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index 8124ab0..9f96277 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -13,11 +13,13 @@
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifdef H5_VMS
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
#include <iostream>
-#endif /*H5_VMS*/
-
+#endif
#include <string>
+
#include "H5Include.h"
#include "H5Exception.h"
#include "H5Library.h"