Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,

including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.

Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!

1 files changed, 47 insertions, 45 deletions

diff --git a/test/testhdf5.h b/test/testhdf5.h
index 1f3f6a0..6b13cae 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -177,53 +177,55 @@ extern "C" {
 #endif
 
 /* Prototypes for the test routines */
-void                    test_metadata(void);
-void                    test_checksum(void);
-void                    test_tst(void);
-void                    test_heap(void);
-void                    test_refstr(void);
-void                    test_file(void);
-void                    test_h5o(void);
-void                    test_h5t(void);
-void                    test_h5s(void);
-void                    test_coords(void);
-void                    test_h5d(void);
-void                    test_attr(void);
-void                    test_select(void);
-void                    test_time(void);
-void                    test_reference(void);
-void                    test_vltypes(void);
-void                    test_vlstrings(void);
-void                    test_iterate(void);
-void                    test_array(void);
-void                    test_genprop(void);
-void            test_configure(void);
-void            test_misc(void);
-void            test_ids(void);
-void            test_skiplist(void);
-void            test_sohm(void);
-void            test_unicode(void);
+void test_metadata(void);
+void test_checksum(void);
+void test_tst(void);
+void test_heap(void);
+void test_refstr(void);
+void test_file(void);
+void test_h5o(void);
+void test_h5t(void);
+void test_h5s(void);
+void test_coords(void);
+void test_h5d(void);
+void test_attr(void);
+void test_select(void);
+void test_time(void);
+void test_reference(void);
+void test_reference_deprec(void);
+void test_vltypes(void);
+void test_vlstrings(void);
+void test_iterate(void);
+void test_array(void);
+void test_genprop(void);
+void test_configure(void);
+void test_misc(void);
+void test_ids(void);
+void test_skiplist(void);
+void test_sohm(void);
+void test_unicode(void);
 
 /* Prototypes for the cleanup routines */
-void                    cleanup_metadata(void);
-void                    cleanup_checksum(void);
-void                    cleanup_file(void);
-void                    cleanup_h5o(void);
-void                    cleanup_h5s(void);
-void                    cleanup_coords(void);
-void                    cleanup_attr(void);
-void                    cleanup_select(void);
-void                    cleanup_time(void);
-void                    cleanup_reference(void);
-void                    cleanup_vltypes(void);
-void                    cleanup_vlstrings(void);
-void                    cleanup_iterate(void);
-void                    cleanup_array(void);
-void                    cleanup_genprop(void);
-void            cleanup_configure(void);
-void            cleanup_sohm(void);
-void            cleanup_misc(void);
-void            cleanup_unicode(void);
+void cleanup_metadata(void);
+void cleanup_checksum(void);
+void cleanup_file(void);
+void cleanup_h5o(void);
+void cleanup_h5s(void);
+void cleanup_coords(void);
+void cleanup_attr(void);
+void cleanup_select(void);
+void cleanup_time(void);
+void cleanup_reference(void);
+void cleanup_reference_deprec(void);
+void cleanup_vltypes(void);
+void cleanup_vlstrings(void);
+void cleanup_iterate(void);
+void cleanup_array(void);
+void cleanup_genprop(void);
+void cleanup_configure(void);
+void cleanup_sohm(void);
+void cleanup_misc(void);
+void cleanup_unicode(void);
 
 #ifdef __cplusplus
 }