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

1 files changed, 5 insertions, 18 deletions

diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index ab93c26..d733ffe 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -19,27 +19,19 @@
 		list 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 FILENAME("tdatatransform.h5");
@@ -126,9 +118,7 @@ static void test_transfplist()
 **  test_dsproplist(): Main dataset property list testing routine.
 **
 ****************************************************************/
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_dsproplist()
 {
     // Output message about test being performed
@@ -138,10 +128,7 @@ void test_dsproplist()
 
 }   // test_dsproplist()
 
-
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_dsproplist()
 {
     HDremove(FILENAME.c_str());