summaryrefslogtreecommitdiffstats
path: root/c++/test/h5cpputil.h
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/h5cpputil.h
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/h5cpputil.h')
-rw-r--r--c++/test/h5cpputil.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index b615194..ede6850 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -26,9 +26,7 @@
#include "h5test.h"
-#ifndef H5_NO_NAMESPACE
using namespace H5;
-#endif
#ifndef H5_NO_STD
using std::cerr;
@@ -129,9 +127,7 @@ template <class Type1, class Type2>
/* Prototypes for the test routines */
-#ifdef __cplusplus
extern "C" {
-#endif
void test_array();
void test_attr();
void test_compound();
@@ -161,9 +157,7 @@ void cleanup_reference();
void cleanup_types();
void cleanup_vlstrings();
-#ifdef __cplusplus
}
-#endif
/* not yet
void cleanup_select(void);