summaryrefslogtreecommitdiffstats
path: root/c++/src/H5File.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2005-12-03 12:21:25 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2005-12-03 12:21:25 (GMT)
commit5ed48cf279c7cbf46a0107cf9726f8607fc714c4 (patch)
tree71309b6dcb43df4f4e51613a114d04245295103a /c++/src/H5File.cpp
parent25576025eb5261a6bc90dc75ab28f40208ef2fdd (diff)
downloadhdf5-5ed48cf279c7cbf46a0107cf9726f8607fc714c4.zip
hdf5-5ed48cf279c7cbf46a0107cf9726f8607fc714c4.tar.gz
hdf5-5ed48cf279c7cbf46a0107cf9726f8607fc714c4.tar.bz2
[svn-r11755] Purpose: Code improvement
Description: There was a workaround for predefined types, in the C++ library, implemented when the C++ library was handling the reference counting of the object ids on its own. Currently, the C++ library is using the available APIs from the C library for that purpose, and there were bugs reported involving that part of the C++ library. So, I decided to remove the workaround completely. Also, improved the use of std members. Platforms tested: Linux 2.4 (heping) SunOS 5.8 64-bit (sol) Linux 2.4 w/PGI (colonelk)
Diffstat (limited to 'c++/src/H5File.cpp')
-rw-r--r--c++/src/H5File.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index a881fa4..50a2fca 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -12,13 +12,19 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <string>
#ifdef OLD_HEADER_FILENAME
#include <iostream.h>
#else
#include <iostream>
#endif
+#include <string>
+#ifndef H5_NO_NAMESPACE
+#ifndef H5_NO_STD
+ using std::string;
+#endif // H5_NO_STD
+#endif
+
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"
@@ -39,7 +45,8 @@
#ifndef H5_NO_NAMESPACE
namespace H5 {
#ifndef H5_NO_STD
- using namespace std;
+ using std::cerr;
+ using std::endl;
#endif // H5_NO_STD
#endif