diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-23 15:54:33 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-23 15:59:44 (GMT) |
| commit | 7f7248220a1cb03535b1e9f9dee905070e999d11 (patch) | |
| tree | 5363e094c1119c9939dff250f3d54d8281f31ea7 /c++/test/ttypes.cpp | |
| parent | c6e1b8f6aa46c6eb0186c16ac923761b9764b06a (diff) | |
| download | hdf5-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/ttypes.cpp')
| -rw-r--r-- | c++/test/ttypes.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index 217b7b9..b77abf2 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -26,18 +26,13 @@ #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 +using namespace H5; #include "h5cpputil.h" // C++ utilility header file @@ -546,9 +541,7 @@ static void test_named () ** test_types(): Main datatypes testing routine. ** ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void test_types() { // Output message about test being performed @@ -578,9 +571,7 @@ void test_types() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_types() { for (int i = 0; i < 3; i++) |