summaryrefslogtreecommitdiffstats
path: root/c++/test/tattr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'c++/test/tattr.cpp')
-rw-r--r--c++/test/tattr.cpp26
1 files changed, 7 insertions, 19 deletions
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 2dfa562..bc46d0f 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -19,28 +19,20 @@
C attribute interface (H5A)
***************************************************************************/
-
#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
-
-#include "H5Cpp.h" // C++ API header file
+using std::cerr;
+using std::endl;
-#ifndef H5_NO_NAMESPACE
- using namespace H5;
-#endif
+#include <string>
+#include "H5Cpp.h" // C++ API header file
+using namespace H5;
-#include "h5cpputil.h" // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h" // C++ utilility header file
const H5std_string FILE_BASIC("tattr_basic.h5");
const H5std_string FILE_COMPOUND("tattr_compound.h5");
@@ -1786,9 +1778,7 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl,
** test_attr(): Main attribute testing routine.
**
****************************************************************/
-#ifdef __cplusplus
extern "C"
-#endif
void test_attr()
{
// Output message about test being performed
@@ -1885,9 +1875,7 @@ void test_attr()
*
*-------------------------------------------------------------------------
*/
-#ifdef __cplusplus
extern "C"
-#endif
void cleanup_attr()
{
HDremove(FILE_BASIC.c_str());