Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'a8892bb42d6f6e4fbc30fae0eb2b957f81c938b9': (45 commits)
  Oops, remove more C99 designated initializers for VS 2010 compatibility.
  Add an #include to get a function declaration.
  Don't use C99 designated initializers, they're not compatible with Visual Studio 2010.
  Quiet some more maybe-uninitialized warnings---each is a false positive, *sigh*.  This is more code that may not compile with VS2010, *sigh sigh*.
  Always warn on maybe-uninitialized.  -Wincompatible-pointer-types was not available until GCC 5, so enable it only if that's the GCC version we're using.
  Only promote maybe-uninitialized warnings to errors on GCC 8.  Even on GCC 8, there may be false positives at low optimization levels?  I need to check.
  Only use -Werror=cast-function-type with GCC 8 and later.
  Put all of the -W options back into the order I found them in so that it's easier to compare old and new config/gnu-flags.
  Add new source files to CMakeLists.txt.
  Mention the -Werror= flags in libhdf5.settings.in.
  free -> HDfree
  Promote decleration-after-statement warnings to errors.
  Quiet decleration-after-statement warnings.
  Move a statement under some declarations since some vintages of Visual Studio don't like declarations after statements.
  Document H5D__chunk_mem_xfree_wrapper().
  Undo accidental test deletion.
  Oops, delete a debug printf that snuck in here.
  Undo my changes to the HD macros, hadn't really intended those to be on this branch....
  Make errors of some more warnings.  Move disabled warnings to DEVELOPER_WARNING_CFLAGS.  Put just one warning option on a line, and sort some of the options.
  Cast to the parameter type, H5VL_token_t *, instead of to unsigned char *.
  ...

1 files changed, 0 insertions, 8 deletions

diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c
index 721a7c6..fdb3179 100644
--- a/test/objcopy_ref.c
+++ b/test/objcopy_ref.c
@@ -1587,7 +1587,6 @@ main(void)
     unsigned    max_compact, min_dense;
     int     configuration;  /* Configuration of tests. */
     int    ExpressMode;
-    hbool_t same_file;  /* Whether to run tests that only use one file */
 
     /* Setup */
     h5_reset();
@@ -1620,11 +1619,6 @@ main(void)
         hid_t fcpl_src;
         hid_t fcpl_dst;
 
-        /* Start with same_file == TRUE.  Use source file settings for these
-         * tests.  Don't run with a non-default destination file setting, as
-         * destination settings have no effect. */
-        same_file = TRUE;
-
         /* No need to test dense attributes with old format */
         if(!(configuration & CONFIG_SRC_NEW_FORMAT) && (configuration & CONFIG_DENSE))
             continue;
@@ -1646,7 +1640,6 @@ main(void)
         if(configuration & CONFIG_SHARE_DST) {
             HDputs("Testing with shared dst messages:");
             fcpl_dst = fcpl_shared;
-            same_file = FALSE;
         }
         else {
             HDputs("Testing without shared dst messages:");
@@ -1678,7 +1671,6 @@ main(void)
         if(configuration & CONFIG_DST_NEW_FORMAT) {
             HDputs("Testing with latest format for destination file:");
             dst_fapl = fapl2;
-            same_file = FALSE;
         } /* end if */
         else {
             HDputs("Testing with oldest file format for destination file:");