5 files changed, 42 insertions, 4 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index a96e95f..0adbfca 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -29,6 +29,15 @@
 #else
 #include <iostream>
 #endif
+#include <string>
+
+#ifndef H5_NO_NAMESPACE
+#ifndef H5_NO_STD
+    using std::string;
+    using std::cerr;
+    using std::endl;
+#endif  // H5_NO_STD
+#endif
 
 #include "testhdf5.h"	// C test header file
 #include "H5Cpp.h"	// C++ API header file
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 44894b2..1d320ca 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -27,6 +27,14 @@
 #endif
 #include <string>
 
+#ifndef H5_NO_NAMESPACE
+#ifndef H5_NO_STD
+    using std::string;
+    using std::cerr;
+    using std::endl;
+#endif  // H5_NO_STD
+#endif
+
 #include "h5test.h"
 #include "H5Exception.h"
 #include "h5cpputil.h"
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 616c73a..34bb6d1 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -19,13 +19,18 @@
 
  ***************************************************************************/
 
-#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 "testhdf5.h"	// C test header file
 #include "H5Cpp.h"	// C++ API header file
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 7737a45..8910408 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -22,13 +22,20 @@
 
  ***************************************************************************/
 
-#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;
+    using std::cerr;
+    using std::endl;
+#endif  // H5_NO_STD
+#endif
 
 #include "testhdf5.h"	// C test header file
 #include "H5Cpp.h"	// C++ API header file
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index b5595b5..d8cdb0b 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -26,6 +26,15 @@
 #else
 #include <iostream>
 #endif
+#include <string>
+
+#ifndef H5_NO_NAMESPACE
+#ifndef H5_NO_STD
+    using std::string;
+    using std::cerr;
+    using std::endl;
+#endif  // H5_NO_STD
+#endif
 
 #include "testhdf5.h"	// C test header file
 #include "H5Cpp.h"	// C++ API header file