Merge with develop (#2790)

5 files changed, 2 insertions, 73 deletions

diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake
index f5b2a88..f710204 100644
--- a/c++/examples/CMakeTests.cmake
+++ b/c++/examples/CMakeTests.cmake
@@ -104,8 +104,8 @@ foreach (example ${tutr_examples})
         -D "TEST_ARGS:STRING="
         -D "TEST_EXPECT=0"
         -D "TEST_SKIP_COMPARE=TRUE"
-        -D "TEST_OUTPUT=tutr_cpp_ex_${example}.txt"
-        #-D "TEST_REFERENCE=cpp_ex_tutr_${example}.out"
+        -D "TEST_OUTPUT=cpp_ex_${example}.txt"
+        #-D "TEST_REFERENCE=cpp_ex_${example}.out"
         -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
         -P "${HDF_RESOURCES_DIR}/runTest.cmake"
     )
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 5c3ce81..1a23f5e 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -1375,14 +1375,6 @@ test_operator(H5File &file)
  *
  *              Failure: -1
  *
- * Modifications:
- *        Nov 12, 01:
- *              - moved h5_cleanup to outside of try block because
- *                dataset.h5 cannot be removed until "file" is out of
- *                scope and dataset.h5 is closed.
- *        Feb 20, 05:
- *              - cleanup_dsets took care of the cleanup now.
- *
  *-------------------------------------------------------------------------
  */
 extern "C" void
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 5677449..d683797 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -65,13 +65,6 @@ const H5std_string FILE4("tfile4.h5");
  * Programmer   Binh-Minh Ribler (use C version)
  *              January, 2001
  *
- * Modifications:
- *        January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *                     cases.  Since there are no operator<< for 'long long'
- *                     or int64 in VS C++ ostream, I casted the hsize_t values
- *                     passed to verify_val to 'long' as well.  If problems
- *                     arises later, this will have to be specifically handled
- *                     with a special routine.
  *-------------------------------------------------------------------------
  */
 static void
@@ -274,13 +267,6 @@ test_file_create()
  * Programmer   Binh-Minh Ribler (use C version)
  *              January, 2001
  *
- * Modifications:
- *        January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *                     cases.  Since there are no operator<< for 'long long'
- *                     or int64 in VS C++ ostream, I casted the hsize_t values
- *                     passed to verify_val to 'long' as well.  If problems
- *                     arises later, this will have to be specifically handled
- *                     with a special routine.
  *-------------------------------------------------------------------------
  */
 static void
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index 2d7dbb8..34078a7 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -96,8 +96,6 @@ filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values
  * Programmer   Binh-Minh Ribler (use C version, from dsets.c/test_filters)
  *              January, 2007
  *
- * Modifications:
- *              Note: H5Z interface is not implemented yet.
  *-------------------------------------------------------------------------
  */
 const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};
@@ -145,8 +143,6 @@ test_null_filter()
  * Programmer   Binh-Minh Ribler (partly from dsets.c/test_filters)
  *              January, 2007
  *
- * Modifications:
- *              Note: H5Z interface is not implemented yet.
  *-------------------------------------------------------------------------
  */
 const H5std_string DSET_SZIP_NAME("szipped dataset");
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 3651aa3..b9a84e1 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -87,16 +87,6 @@ int space5_data = 7;
  * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
- * Modifications:
- *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *              cases.  Since there are no operator<< for 'long long'
- *              or int64 in VS C++ ostream, I casted the hssize_t values
- *              passed to verify_val to 'long' as well.  If problems
- *              arises later, this will have to be specifically handled
- *              with a special routine.
- *     April 12, 2011: Raymond Lu
- *              Starting from the 1.8.7 release, we allow dimension
- *              size to be zero.  So I took out the test against it.
  *-------------------------------------------------------------------------
  */
 static void
@@ -223,13 +213,6 @@ test_h5s_basic()
  * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
- * Modifications:
- *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *              cases.  Since there are no operator<< for 'long long'
- *              or int64 in VS C++ ostream, I casted the hssize_t values
- *              passed to verify_val to 'long' as well.  If problems
- *              arises later, this will have to be specifically handled
- *              with a special routine.
  *-------------------------------------------------------------------------
  */
 static void
@@ -287,13 +270,6 @@ test_h5s_scalar_write()
  * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
- * Modifications:
- *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *              cases.  Since there are no operator<< for 'long long'
- *              or int64 in VS C++ ostream, I casted the hssize_t values
- *              passed to verify_val to 'long' as well.  If problems
- *              arises later, this will have to be specifically handled
- *              with a special routine.
  *-------------------------------------------------------------------------
  */
 static void
@@ -348,13 +324,6 @@ test_h5s_scalar_read()
  * Programmer   Raymond Lu (using C version)
  *              May 18, 2004
  *
- * Modifications:
- *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *              cases.  Since there are no operator<< for 'long long'
- *              or int64 in VS C++ ostream, I casted the hssize_t values
- *              passed to verify_val to 'long' as well.  If problems
- *              arises later, this will have to be specifically handled
- *              with a special routine.
  *-------------------------------------------------------------------------
  */
 static void
@@ -402,13 +371,6 @@ test_h5s_null()
  * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
- * Modifications:
- *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *              cases.  Since there are no operator<< for 'long long'
- *              or int64 in VS C++ ostream, I casted the hssize_t values
- *              passed to verify_val to 'long' as well.  If problems
- *              arises later, this will have to be specifically handled
- *              with a special routine.
  *-------------------------------------------------------------------------
  */
 static void
@@ -470,13 +432,6 @@ test_h5s_compound_scalar_write()
  * Programmer   Binh-Minh Ribler (using C version)
  *              Mar 2001
  *
- * Modifications:
- *      January, 2005: C tests' macro VERIFY casts values to 'long' for all
- *              cases.  Since there are no operator<< for 'long long'
- *              or int64 in VS C++ ostream, I casted the hssize_t values
- *              passed to verify_val to 'long' as well.  If problems
- *              arises later, this will have to be specifically handled
- *              with a special routine.
  *-------------------------------------------------------------------------
  */
 static void