summaryrefslogtreecommitdiffstats
path: root/c++/test/tlinks.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2016-10-19 20:50:17 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2016-10-19 20:50:17 (GMT)
commita903cbafa863f22d360e7ef59f787b4fe0c0d2c3 (patch)
treeffcd2e4953ebf5e86621a904aba4cc8207b24185 /c++/test/tlinks.cpp
parentb6bb7c123a02570a33f02257d738e50195dbeb3a (diff)
downloadhdf5-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/tlinks.cpp')
-rw-r--r--c++/test/tlinks.cpp24
1 files changed, 6 insertions, 18 deletions
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index a3eb690..1f7d14e 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -18,28 +18,20 @@
C link interface (H5L)
***************************************************************************/
-
#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 "h5cpputil.h" // C++ test utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
// A lot of the definition inherited from C test links.c is left here until
// the H5L API is implemented and tests are completed - BMR 10/19/2009
@@ -460,9 +452,7 @@ static void test_basic_links(hid_t fapl_id, hbool_t new_format)
*
*-------------------------------------------------------------------------
*/
-#ifdef __cplusplus
extern "C"
-#endif
void test_links()
{
hid_t fapl_id, fapl2_id; /* File access property lists */
@@ -651,9 +641,7 @@ void test_links()
*
*-------------------------------------------------------------------------
*/
-#ifdef __cplusplus
extern "C"
-#endif
void cleanup_links()
{
HDremove(FILENAME[0]);