diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-19 20:50:17 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-19 20:50:17 (GMT) |
| commit | a903cbafa863f22d360e7ef59f787b4fe0c0d2c3 (patch) | |
| tree | ffcd2e4953ebf5e86621a904aba4cc8207b24185 /c++/test/tobject.cpp | |
| parent | b6bb7c123a02570a33f02257d738e50195dbeb3a (diff) | |
| download | hdf5-a903cbafa863f22d360e7ef59f787b4fe0c0d2c3.zip hdf5-a903cbafa863f22d360e7ef59f787b4fe0c0d2c3.tar.gz hdf5-a903cbafa863f22d360e7ef59f787b4fe0c0d2c3.tar.bz2 | |
Description:
Removed obsolet macros from C++ API:
H5_NO_NAMESPACE, H5_NO_STD, __cplusplus
Leave OLD_HEADER_FILENAME because iostream.h might still be in use,
until further checking is done.
Platforms tested:
Linux/32 2.6 (jam)
Linux/64 (platypus)
Darwin (osx1010test)
Jelly
Diffstat (limited to 'c++/test/tobject.cpp')
| -rw-r--r-- | c++/test/tobject.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp index 046e67a..b8654c3 100644 --- a/c++/test/tobject.cpp +++ b/c++/test/tobject.cpp @@ -18,27 +18,19 @@ tobject.cpp - HDF5 C++ testing object related functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file const H5std_string FILE_OBJECTS("tobjects.h5"); @@ -319,9 +311,7 @@ static void test_get_objtype() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_object() { // Output message about test being performed @@ -346,9 +336,7 @@ void test_object() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_object() { HDremove(FILE_OBJECTS.c_str()); |