summaryrefslogtreecommitdiffstats
path: root/c++/test/dsets.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2016-10-23 15:54:33 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2016-10-23 15:59:44 (GMT)
commit7f7248220a1cb03535b1e9f9dee905070e999d11 (patch)
tree5363e094c1119c9939dff250f3d54d8281f31ea7 /c++/test/dsets.cpp
parentc6e1b8f6aa46c6eb0186c16ac923761b9764b06a (diff)
downloadhdf5-7f7248220a1cb03535b1e9f9dee905070e999d11.zip
hdf5-7f7248220a1cb03535b1e9f9dee905070e999d11.tar.gz
hdf5-7f7248220a1cb03535b1e9f9dee905070e999d11.tar.bz2
Purpose: Fix HDFFV-9532
Description: Removed obsolete macros from C++ API library and tests: H5_NO_NAMESPACE and __cplusplus Leave OLD_HEADER_FILENAME because iostream.h might still be in use, until further checking is done. Leave H5_NO_STD to consider retiring H5std_string first. Platforms tested: Linux/32 2.6 (jam) Linux/64 (jelly) Darwin (osx1010test)
Diffstat (limited to 'c++/test/dsets.cpp')
-rw-r--r--c++/test/dsets.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 7dcda0d..a9191d1 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -32,18 +32,14 @@
#endif
#include <string>
-#ifndef H5_NO_NAMESPACE
#ifndef H5_NO_STD
using std::cerr;
using std::endl;
#endif // H5_NO_STD
-#endif
#include "H5Cpp.h" // C++ API header file
-#ifndef H5_NO_NAMESPACE
using namespace H5;
-#endif
#include "h5cpputil.h" // C++ utilility header file
@@ -1175,9 +1171,7 @@ test_types(H5File& file)
*
*-------------------------------------------------------------------------
*/
-#ifdef __cplusplus
extern "C"
-#endif
void test_dset()
{
hid_t fapl_id;
@@ -1235,9 +1229,7 @@ void test_dset()
*
*-------------------------------------------------------------------------
*/
-#ifdef __cplusplus
extern "C"
-#endif
void cleanup_dsets()
{
HDremove(FILE1.c_str());