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

* commit 'a608cd4e09213433ec7799777da4a0a98a03ed42':
  napshot version 1.8 release 21 (snap1)
  Snapshot version 1.8 release 21 (snap1)
  Replaced H5Dopen with H5Dopen2. Platform tested:     Linux/32 2.6 (jam)

8 files changed, 30 insertions, 30 deletions

diff --git a/README.txt b/README.txt
index cae4018..2f71026 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap1 currently under development
+HDF5 version 1.8.21-snap2 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index f0aaa51..a44864f 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap1, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap2, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 769db0e..492a6b7 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################

 

 set (CTEST_SOURCE_VERSION "1.8.21")

-set (CTEST_SOURCE_VERSEXT "-snap1")

+set (CTEST_SOURCE_VERSEXT "-snap2")

 

 ##############################################################################

 # handle input parameters to script.

diff --git a/configure b/configure
index 58ff0e9..1671c32 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap0.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap2.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap0'
-PACKAGE_STRING='HDF5 1.8.21-snap0'
+PACKAGE_VERSION='1.8.21-snap2'
+PACKAGE_STRING='HDF5 1.8.21-snap2'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap0 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap0:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap2:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap0
+HDF5 configure 1.8.21-snap2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap0, which was
+It was created by HDF5 $as_me 1.8.21-snap2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap0'
+ VERSION='1.8.21-snap2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap0
+HDF5 config.lt 1.8.21-snap2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap0, which was
+This file was extended by HDF5 $as_me 1.8.21-snap2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap0
+HDF5 config.status 1.8.21-snap2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 4d3ba3d..b236963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap1], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap2], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index e0d37d7..f430106 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap1 currently under development
+HDF5 version 1.8.21-snap2 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index d01229b..9d54967 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap1"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap2"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap1"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap2"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/test/tverbounds18.c b/test/tverbounds18.c
index abba767..2ae87c1 100644
--- a/test/tverbounds18.c
+++ b/test/tverbounds18.c
@@ -64,8 +64,8 @@ static void test_earliest_latest(void)
      */
 
     /* Open the dataset */
-    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
-    CHECK(dset, FAIL, "H5Dopen");
+    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
+    CHECK(dset, FAIL, "H5Dopen2");
 
     ret = H5Dclose(dset);
     CHECK(ret, FAIL, "H5Dclose");
@@ -77,9 +77,9 @@ static void test_earliest_latest(void)
 
     /* Open the dataset */
     H5E_BEGIN_TRY {
-        dset = H5Dopen(fid, "DS_chunked_layout_4", H5P_DEFAULT);
+        dset = H5Dopen2(fid, "DS_chunked_layout_4", H5P_DEFAULT);
     } H5E_END_TRY;
-    VERIFY(dset, FAIL, "H5Dopen");
+    VERIFY(dset, FAIL, "H5Dopen2");
 
     /* Close the file */
     ret = H5Fclose(fid);
@@ -114,8 +114,8 @@ static void test_earliest_v18(void)
      */
 
     /* Open the dataset */
-    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
-    CHECK(dset, FAIL, "H5Dopen");
+    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
+    CHECK(dset, FAIL, "H5Dopen2");
 
     ret = H5Dclose(dset);
     CHECK(ret, FAIL, "H5Dclose");
@@ -177,8 +177,8 @@ static void test_v18_latest(void)
      */
 
     /* Open the dataset */
-    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
-    CHECK(dset, FAIL, "H5Dopen");
+    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
+    CHECK(dset, FAIL, "H5Dopen2");
 
     ret = H5Dclose(dset);
     CHECK(ret, FAIL, "H5Dclose");
@@ -218,8 +218,8 @@ static void test_v18_v18(void)
      */
 
     /* Open the dataset */
-    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
-    CHECK(dset, FAIL, "H5Dopen");
+    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
+    CHECK(dset, FAIL, "H5Dopen2");
 
     ret = H5Dclose(dset);
     CHECK(ret, FAIL, "H5Dclose");
@@ -231,9 +231,9 @@ static void test_v18_v18(void)
 
     /* Open the dataset */
     H5E_BEGIN_TRY {
-        dset = H5Dopen(fid, "DS_chunked_layout_4", H5P_DEFAULT);
+        dset = H5Dopen2(fid, "DS_chunked_layout_4", H5P_DEFAULT);
     } H5E_END_TRY;
-    VERIFY(dset, FAIL, "H5Dopen");
+    VERIFY(dset, FAIL, "H5Dopen2");
 
     /* Close the file */
     ret = H5Fclose(fid);