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

17 files changed, 89 insertions, 271 deletions

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 5d0c8a1..8752744 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -30,21 +30,14 @@
 #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	FILE1("dataset.h5");
@@ -1175,9 +1168,7 @@ test_types(H5File& file)
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_dset()
 {
     hid_t	fapl_id;
@@ -1235,9 +1226,7 @@ void test_dset()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_dsets()
 {
     HDremove(FILE1.c_str());
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 3bc38b5..95d29a8 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -26,25 +26,16 @@
 #else
 #include <iostream>
 #endif
-#include <string>
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-#ifndef H5_NO_STD
-    using std::cerr;
-    using std::endl;
-#endif  // H5_NO_STD
-#endif
+#include <string>
+#include "H5Cpp.h"      // C++ API header file
+using namespace H5;
 
 #include "h5test.h"
-#include "H5Cpp.h"
-
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif
-
-#include "h5cpputil.h"
+#include "h5cpputil.h"  // C++ utilility header file
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_report
  *
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index 0a3221d..f8aaec7 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -26,14 +26,9 @@
 
 #include "h5test.h"
 
-#ifndef H5_NO_NAMESPACE
 using namespace H5;
-#endif
-
-#ifndef H5_NO_STD
 using std::cerr;
 using std::endl;
-#endif
 
 #define MESSAGE(V,A) {if (HDGetTestVerbosity()>(V)) print_func A;}
 #define SUBTEST(TEST) {printf("   Subtest: %-52s",TEST); fflush(stdout);}
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index 441ef81..7fe2e6b 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -18,27 +18,19 @@
    tarray.cpp - HDF5 C++ testing the array datatype 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("tarray.h5");
@@ -478,9 +470,7 @@ static void test_array_info()
 **  test_array(): Main datatypes testing routine.
 **
 ****************************************************************/
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_array()
 {
     // Output message about test being performed
@@ -512,9 +502,7 @@ void test_array()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_array()
 {
     HDremove(FILENAME.c_str());
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());
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index e08c81d..f49ebb2 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -18,27 +18,19 @@
    tcompound.cpp - HDF5 C++ testing the compound data type 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
 
 /* Number of elements in each test */
@@ -832,9 +824,7 @@ static void test_compound_set_size()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_compound()
 {
     // Output message about test being performed
@@ -862,9 +852,7 @@ void test_compound()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_compound()
 {
     HDremove(COMPFILE.c_str());
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());
diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp
index 4fe4b58..28ede6b 100644
--- a/c++/test/testhdf5.cpp
+++ b/c++/test/testhdf5.cpp
@@ -40,28 +40,19 @@
 	GetTestNumErrs() -- Retrieve the number of testing errors
 
  ***************************************************************************/
-
 #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 "h5test.h"	// C test header file
-#include "H5Cpp.h"	// C++ API header file
+using std::cerr;
+using std::endl;
 
-#ifndef H5_NO_NAMESPACE
-    using namespace H5;
-#endif  /* !H5_NO_NAMESPACE */
+#include <string>
+#include "H5Cpp.h"      // C++ API header file
+using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 int
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 0eabfb9..dba0980 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -22,28 +22,20 @@
         h5_fileaccess() -- in h5test.c, returns a file access template
 
  ***************************************************************************/
-
 #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 hsize_t F1_USERBLOCK_SIZE = (hsize_t)0;
 const size_t F1_OFFSET_SIZE = sizeof(haddr_t);
@@ -817,9 +809,7 @@ static void test_commonfg()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_file()
 {
     // Output message about test being performed
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index 19549b3..ee78fe1 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -18,27 +18,19 @@
    tfilter.cpp - HDF5 C++ testing various filters and their combination.
 
  ***************************************************************************/
-
 #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
 
 #define DSET_DIM1	  100
@@ -258,9 +250,7 @@ static void test_szip_filter(H5File& file1)
 **
 ****************************************************************/
 const H5std_string      FILE1("tfilters.h5");
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_filters()
 {
     // Output message about test being performed
@@ -300,9 +290,7 @@ void test_filters()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_filters()
 {
     HDremove(FILE1.c_str());
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 7ef048b..c795c08 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -21,28 +21,20 @@
    EXTERNAL ROUTINES/VARIABLES:
 
  ***************************************************************************/
-
 #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
 #include "H5srcdir.h"	// srcdir querying header file
 
 const H5std_string    TESTFILE("th5s.h5");
@@ -566,9 +558,7 @@ static void test_h5s_compound_scalar_read()
  * Modifications:
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_h5s()
 {
     // Output message about test being performed
@@ -597,9 +587,7 @@ void test_h5s()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_h5s()
 {
     HDremove(DATAFILE.c_str());
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
index e4aee97..7ee2b53 100644
--- a/c++/test/titerate.cpp
+++ b/c++/test/titerate.cpp
@@ -18,27 +18,19 @@
    titerate.cpp - HDF5 C++ testing iterate 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
 
 /* Number of datasets for group iteration test */
@@ -501,9 +493,7 @@ static void test_HDFFV_9920()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_iterate()
 {
     // Output message about test being performed
@@ -532,9 +522,7 @@ void test_iterate()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_iterate()
 {
     HDremove(FILE_ITERATE.c_str());
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]);
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());
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 1974541..9bc2eb0 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -19,20 +19,19 @@
 		Reference interface (H5R)
 
  ***************************************************************************/
-
 #ifdef OLD_HEADER_FILENAME
 #include <iostream.h>
 #else
 #include <iostream>
 #endif
-#include <string>
+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      FILE1("trefer1.h5");
@@ -808,9 +807,7 @@ static void test_reference_compat(void)
 **  test_reference(): Main reference testing routine.
 **
 ****************************************************************/
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_reference(void)
 {
     // Output message about test being performed
@@ -830,9 +827,7 @@ void test_reference(void)
 ** Purpose:	Cleanup temporary test files
 ** Return:	none
 ****************************************************************/
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_reference(void)
 {
     HDremove(FILE1.c_str());
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index c65d6a5..1ef7bdd 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -18,27 +18,19 @@
    ttypes.cpp - HDF5 C++ testing the general datatype 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
 
 /*
@@ -549,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
@@ -581,9 +571,7 @@ void test_types()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_types()
 {
     for (int i = 0; i < 3; i++)
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 6ec7f25..d39d092 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -20,27 +20,19 @@
    EXTERNAL ROUTINES/VARIABLES:
 
  ***************************************************************************/
-
 #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
 
 // Data file used in most test functions
@@ -958,9 +950,7 @@ static void test_vl_rewrite()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void test_vlstrings()
 {
     // Output message about test being performed
@@ -1000,9 +990,7 @@ void test_vlstrings()
  *
  *-------------------------------------------------------------------------
  */
-#ifdef __cplusplus
 extern "C"
-#endif
 void cleanup_vlstrings()
 {
     HDremove(FILENAME.c_str());