[svn-r27001] Bring revisions #26837 - #26843 from trunk to revise_chunks.

h5committested.

14 files changed, 194 insertions, 102 deletions

diff --git a/bin/h5vers b/bin/h5vers
index cb4b9e0..2aa8023 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -187,6 +187,10 @@ die "unable to read file: $RELEASE\n" unless -r $file;
 my $CONFIGURE = $file;
 $CONFIGURE =~ s/[^\/]*$/..\/configure.ac/;
 die "unable to read file: $CONFIGURE\n" unless -r $file;
+# cpp_doc_config
+my $CPP_DOC_CONFIG = $file;
+$CPP_DOC_CONFIG =~ s/[^\/]*$/..\/c++\/src\/cpp_doc_config/;
+die "unable to read file: $CPP_DOC_CONFIG\n"  unless -r $file;
 
 # Get the current version number.
 open FILE, $file or die "unable to open $file: $!\n";
@@ -234,7 +238,8 @@ if ($set) {
   $README = "";
   $RELEASE = "";
   $CONFIGURE = "";
-  $LT_VERS = "";
+  $CPP_DOC_CONFIG = "";
+  $LT_VERS = "";        
   @newver = @curver;
 }
 
@@ -309,6 +314,46 @@ if ($RELEASE) {
   close FILE;
 }
 
+# Update the c++/src/cpp_doc_config file
+if ($CPP_DOC_CONFIG) {
+  my $data = read_file($CPP_DOC_CONFIG);
+  my $version_string = sprintf("HDF5 version %d.%d.%d%s %s",
+                               @newver[0,1,2],
+                               $newver[3] eq "" ? "" : "-".$newver[3],
+                               "currently under development");
+
+  $data =~ s/PROJECT_NUMBER\s*=.*/PROJECT_NUMBER         = $version_string/;
+
+  write_file($CPP_DOC_CONFIG, $data);  
+}
+
+# helper function to read the file for updating c++/src/cpp_doc_config file.
+# The version string in that file is not at the top, so the string replacement
+# is not for the first line, and reading/writing the entire file as one string
+# facilitates the substring replacement.
+sub read_file {
+   my ($filename) = @_;
+
+    open my $in, $filename or die "Could not open '$filename' for reading $!";
+    local $/ = undef;
+    my $all = <$in>;
+    close $in;
+
+    return $all;
+}
+
+# helper function to write the file for updating c++/src/cpp_doc_config file.
+sub write_file {
+    my ($filename, $content) = @_;
+
+    open my $out, ">$filename" or die "Could not open '$filename' for writing $!";;
+    print $out $content;
+    close $out;
+
+    return;
+}
+
+
 sub gen_configure {
   my ($name, $conf) = @_;
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index f2caed2..7ea93f6 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,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.13
+PROJECT_NUMBER         = HDF5 version 1.9.216 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/configure b/configure
index 661827e..8df18a6 100755
--- a/configure
+++ b/configure
@@ -7684,6 +7684,19 @@ fi
 
 
 ## ----------------------------------------------------------------------
+## Disable shared libraries on CYGWIN. (LK - 04/16/15)
+## A number of tests run by "make check" fail on CYGWIN, so for HDF5 v1.8.15
+## we will change the default for shared libraries to disabled.
+
+
+case "`uname`" in
+  CYGWIN*)
+    enable_shared="no"
+    CHECK_WARN="Shared libraries are not currently supported on CYGWIN."
+    ;;
+esac
+
+## ----------------------------------------------------------------------
 ## Fortran libraries are not currently supported on Mac. Disable them.
 ## (this is overridable with --enable-unsupported).
 ##
@@ -21435,6 +21448,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
 ## ----------------------------------------------------------------------
 ## Check if we should install only statically linked executables.
 ##   This check needs to occur after libtool is initialized because
@@ -33135,5 +33150,11 @@ cat >> src/H5config.h <<EOF
 #endif
 EOF
 
+## HDF5 configure code created by autotools with gcc 4.9.2 is adding problematic
+## linker flags:  -l with no library name; -l <libname>, specifically gfortran or m.
+## This sed script corrects "-l <libname>" first and then "-l " with no library name.
+## If the order is not preserved, all instances of "-l " will be removed.
+sed -e '/^postdeps/ s/-l \(a-zA-Z\)/-l\1/g' -e '/^postdeps/ s/-l //g' -i libtool
+
 ## show the configure settings
 cat src/libhdf5.settings
diff --git a/configure.ac b/configure.ac
index 7d173e0..6fde896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -637,6 +637,19 @@ AC_SUBST([RUNPARALLEL])
 AC_SUBST([TESTPARALLEL])
 
 ## ----------------------------------------------------------------------
+## Disable shared libraries on CYGWIN. (LK - 04/16/15)
+## A number of tests run by "make check" fail on CYGWIN, so for HDF5 v1.8.15
+## we will change the default for shared libraries to disabled.
+
+
+case "`uname`" in
+  CYGWIN*)
+    enable_shared="no"
+    CHECK_WARN="Shared libraries are not currently supported on CYGWIN."
+    ;;
+esac
+
+## ----------------------------------------------------------------------
 ## Fortran libraries are not currently supported on Mac. Disable them.
 ## (this is overridable with --enable-unsupported).
 ##
@@ -687,6 +700,8 @@ LT_PREREQ([2.2])
 ## win32-dll - This will build clean dlls on win32 platforms.
 LT_INIT([dlopen,win32-dll])
 
+
+
 ## ----------------------------------------------------------------------
 ## Check if we should install only statically linked executables.
 ##   This check needs to occur after libtool is initialized because
@@ -2905,5 +2920,11 @@ cat >> src/H5config.h <<EOF
 #endif
 EOF
 
+## HDF5 configure code created by autotools with gcc 4.9.2 is adding problematic
+## linker flags:  -l with no library name; -l <libname>, specifically gfortran or m.
+## This sed script corrects "-l <libname>" first and then "-l " with no library name.
+## If the order is not preserved, all instances of "-l " will be removed.
+sed -e '/^postdeps/ s/-l \([a-zA-Z]\)/-l\1/g' -e '/^postdeps/ s/-l //g' -i libtool
+
 ## show the configure settings
 cat src/libhdf5.settings
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 6ca95c54..36591d3 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -1641,229 +1641,229 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 101 "H5LTparse.y"
     { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
     break;
 
   case 3:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 102 "H5LTparse.y"
     { return (yyval.hid);}
     break;
 
   case 13:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 116 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
     break;
 
   case 14:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 117 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
     break;
 
   case 15:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 118 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
     break;
 
   case 16:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 119 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
     break;
 
   case 17:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 120 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
     break;
 
   case 18:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 121 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
     break;
 
   case 19:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 122 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
     break;
 
   case 20:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 123 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
     break;
 
   case 21:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 124 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
     break;
 
   case 22:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 125 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
     break;
 
   case 23:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 126 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
     break;
 
   case 24:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 127 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
     break;
 
   case 25:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 128 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
     break;
 
   case 26:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 129 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
     break;
 
   case 27:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 130 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
     break;
 
   case 28:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 131 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
     break;
 
   case 29:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 132 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
     break;
 
   case 30:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 133 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
     break;
 
   case 31:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 134 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
     break;
 
   case 32:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 135 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
     break;
 
   case 33:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 136 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
     break;
 
   case 34:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 137 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
     break;
 
   case 35:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 138 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
     break;
 
   case 36:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 139 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
     break;
 
   case 37:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 140 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
     break;
 
   case 38:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 141 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
     break;
 
   case 39:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 142 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
     break;
 
   case 40:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 145 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
     break;
 
   case 41:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 146 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
     break;
 
   case 42:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 147 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
     break;
 
   case 43:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 148 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
     break;
 
   case 44:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 149 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
     break;
 
   case 45:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 150 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
     break;
 
   case 46:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 151 "H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
     break;
 
   case 47:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 155 "H5LTparse.y"
     { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ }
     break;
 
   case 48:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 157 "H5LTparse.y"
     { (yyval.hid) = cmpd_stack[csindex].id; 
                               cmpd_stack[csindex].id = 0;
@@ -1873,13 +1873,13 @@ yyreduce:
     break;
 
   case 51:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 166 "H5LTparse.y"
     { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ }
     break;
 
   case 52:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 168 "H5LTparse.y"
     {   
                             size_t origin_size, new_size;
@@ -1915,7 +1915,7 @@ yyreduce:
     break;
 
   case 53:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 201 "H5LTparse.y"
     {
                             (yyval.sval) = yylval.sval;
@@ -1923,25 +1923,25 @@ yyreduce:
     break;
 
   case 54:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 206 "H5LTparse.y"
     { (yyval.ival) = 0; }
     break;
 
   case 55:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 208 "H5LTparse.y"
     { (yyval.ival) = yylval.ival; }
     break;
 
   case 57:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 212 "H5LTparse.y"
     { asindex++; /*pushd onto the stack*/ }
     break;
 
   case 58:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 214 "H5LTparse.y"
     { 
                           (yyval.hid) = H5Tarray_create2((yyvsp[(5) - (6)].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
@@ -1952,13 +1952,13 @@ yyreduce:
     break;
 
   case 61:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 224 "H5LTparse.y"
     { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ }
     break;
 
   case 62:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 225 "H5LTparse.y"
     { unsigned ndims = arr_stack[asindex].ndims;
                                   arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; 
@@ -1968,19 +1968,19 @@ yyreduce:
     break;
 
   case 65:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 236 "H5LTparse.y"
     { (yyval.hid) = H5Tvlen_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
     break;
 
   case 66:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 241 "H5LTparse.y"
     { is_opq_size = 1; }
     break;
 
   case 67:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 242 "H5LTparse.y"
     {   
                                 size_t size = (size_t)yylval.ival;
@@ -1990,13 +1990,13 @@ yyreduce:
     break;
 
   case 68:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 247 "H5LTparse.y"
     { is_opq_tag = 1; }
     break;
 
   case 69:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 248 "H5LTparse.y"
     {  
                                 H5Tset_tag((yyvsp[(7) - (13)].hid), yylval.sval);
@@ -2005,19 +2005,19 @@ yyreduce:
     break;
 
   case 70:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 252 "H5LTparse.y"
     { (yyval.hid) = (yyvsp[(7) - (15)].hid); }
     break;
 
   case 73:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 260 "H5LTparse.y"
     { is_str_size = 1; }
     break;
 
   case 74:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 261 "H5LTparse.y"
     {  
                                 if((yyvsp[(5) - (6)].ival) == H5T_VARIABLE_TOKEN)
@@ -2029,7 +2029,7 @@ yyreduce:
     break;
 
   case 75:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 269 "H5LTparse.y"
     {
                                 if((yyvsp[(9) - (10)].ival) == H5T_STR_NULLTERM_TOKEN)
@@ -2042,7 +2042,7 @@ yyreduce:
     break;
 
   case 76:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 278 "H5LTparse.y"
     {  
                                 if((yyvsp[(13) - (14)].ival) == H5T_CSET_ASCII_TOKEN)
@@ -2053,7 +2053,7 @@ yyreduce:
     break;
 
   case 77:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 285 "H5LTparse.y"
     {
                                 if((yyvsp[(17) - (18)].hid) == H5T_C_S1_TOKEN)
@@ -2064,7 +2064,7 @@ yyreduce:
     break;
 
   case 78:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 292 "H5LTparse.y"
     {   
                                 hid_t str_id = (yyvsp[(19) - (20)].hid);
@@ -2085,67 +2085,67 @@ yyreduce:
     break;
 
   case 79:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 309 "H5LTparse.y"
     {(yyval.ival) = H5T_VARIABLE_TOKEN;}
     break;
 
   case 81:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 312 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
     break;
 
   case 82:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 313 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
     break;
 
   case 83:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 314 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
     break;
 
   case 84:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 316 "H5LTparse.y"
     {(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
     break;
 
   case 85:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 317 "H5LTparse.y"
     {(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
     break;
 
   case 86:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 319 "H5LTparse.y"
     {(yyval.hid) = H5T_C_S1_TOKEN;}
     break;
 
   case 87:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 320 "H5LTparse.y"
     {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
     break;
 
   case 88:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 324 "H5LTparse.y"
     { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
     break;
 
   case 89:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 326 "H5LTparse.y"
     { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
     break;
 
   case 92:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 331 "H5LTparse.y"
     {
                                                 is_enum_memb = 1; /*indicate member of enum*/
@@ -2158,7 +2158,7 @@ yyreduce:
     break;
 
   case 93:
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 340 "H5LTparse.y"
     {
                                 char char_val=(char)yylval.ival;
@@ -2205,7 +2205,7 @@ yyreduce:
     break;
 
 
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 2191 "H5LTparse.c"
       default: break;
     }
diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h
index 621dacd..1461830 100644
--- a/hl/src/H5LTparse.h
+++ b/hl/src/H5LTparse.h
@@ -109,7 +109,7 @@ extern int H5LTyydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 68 "H5LTparse.y"
 
     int     ival;         /*for integer token*/
@@ -117,7 +117,7 @@ typedef union YYSTYPE
     hid_t   hid;          /*for hid_t token*/
 
 
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 122 "H5LTparse.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt
index 2b72cac..26d3cb9 100644
--- a/release_docs/INSTALL_Cygwin.txt
+++ b/release_docs/INSTALL_Cygwin.txt
@@ -34,7 +34,7 @@ Preconditions:
     
     The following compilers are supported by HDF5 and included in the Cygwin
     package system:
-       gcc (4.7.3), which includes:
+       gcc (4.7.3 and 4.9.2), which includes:
             gcc4-core    : C compiler
             gcc4-g++     : C++ compiler
             gcc4-fortran : fortran compiler
@@ -72,7 +72,6 @@ Preconditions:
       
        The latest supported public release of SZIP is available from
        ftp://ftp.hdfgroup.org/lib-external/szip/2.1.
-
     
     2.3 Additional Utilities
     
@@ -260,6 +259,11 @@ Build, Test and Install HDF5 on Cygwin
    dt_arith tests may fail due to the use of fork. This is a known issue
    with cygwin on Windows.
 
+   "make check" fails when building shared lib files is enabled.  The default
+   on Cygwin has been changed to disable shared.  It can be enabled with
+   the --enable-shared configure option but is likely to fail "make check" 
+   with GCC compilers.
+
 -----------------------------------------------------------------------
 
 Need Further assistance, email help@hdfgroup.org
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index d840b65..dbc6018 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1383,6 +1383,11 @@ The following platforms are not supported but have been tested for this release.
 
 Known Problems
 ==============
+* "make check" fails on CYGWIN when building shared lib files is enabled.  The
+   default on Cygwin has been changed to disable shared.  It can be enabled with
+   the --enable-shared configure option but is likely to fail "make check"
+   with GCC compilers. (LK -2015/04/16)
+
 * CLANG compiler with the options -fcatch-undefined-behavior and -ftrapv
   catches some undefined behavior in the alignment algorithm of the macro DETECT_I
   in H5detect.c (Issue 8147).  Since the algorithm is trying to detect the alignment 
diff --git a/src/H5AC.c b/src/H5AC.c
index 39385ec..2a80cd8 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -604,7 +604,7 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id)
 #ifdef H5_HAVE_PARALLEL
     H5AC_aux_t * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 715fad3..f2ba37d 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -42,7 +42,7 @@
 #define H5AC__TRACE_FILE_ENABLED	0
 #endif /* H5_METADATA_TRACE_FILE */
 
-/* Define global metadata tag values */
+/* Global metadata tag values */
 #define H5AC__INVALID_TAG      (haddr_t)0
 #define H5AC__IGNORE_TAG       (haddr_t)1
 #define H5AC__SUPERBLOCK_TAG   (haddr_t)2
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 39e3e48..84b7294 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -332,7 +332,7 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz
     H5D_chk_idx_info_t idx_info;        /* Chunked index info */
     hsize_t scaled[H5S_MAX_RANK];       /* Scaled coordinates for this chunk */
     H5F_block_t old_chunk;              /* Offset/length of old chunk */
-    hbool_t     need_insert = FALSE;    /* Whether the chunk needs to be inserted into the index */
+    hbool_t need_insert = FALSE;        /* Whether the chunk needs to be inserted into the index */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC_TAG(dxpl_id, dset->oloc.addr, FAIL)
@@ -380,7 +380,7 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz
 
     /* Make sure the address of the chunk is returned. */
     if(!H5F_addr_defined(udata.chunk_block.offset))
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunk address isn't defined")
+        HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "chunk address isn't defined")
 
     /* Evict the (old) entry from the cache if present, but do not flush
      * it to disk */
@@ -751,10 +751,8 @@ H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
     /* Set the number of dimensions for the memory dataspace */
     H5_ASSIGN_OVERFLOW(fm->m_ndims, sm_ndims, int, unsigned);
 
-    /* Get dim number and dimensionality for each dataspace */
+    /* Get rank for file dataspace */
     fm->f_ndims = f_ndims = dataset->shared->layout.u.chunk.ndims - 1;
-    if(H5S_get_simple_extent_dims(file_space, fm->f_dims, NULL) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "unable to get dimensionality")
 
     /* Normalize hyperslab selections by adjusting them by the offset */
     /* (It might be worthwhile to normalize both the file and memory dataspaces
@@ -2670,7 +2668,7 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
                 point_of_no_return = TRUE;
                 ent->chunk = NULL;
             } /* end else */
-            H5_ASSIGN_OVERFLOW(nbytes, udata.chunk_block.length, uint32_t, size_t);
+            H5_ASSIGN_OVERFLOW(nbytes, udata.chunk_block.length, hsize_t, size_t);
             if(H5Z_pipeline(&(dset->shared->dcpl_cache.pline), 0, &(udata.filter_mask), dxpl_cache->err_detect,
                      dxpl_cache->filter_cb, &nbytes, &alloc, &buf) < 0)
                 HGOTO_ERROR(H5E_PLINE, H5E_CANTFILTER, FAIL, "output pipeline failed")
@@ -2679,7 +2677,7 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
             if(nbytes > ((size_t)0xffffffff))
                 HGOTO_ERROR(H5E_DATASET, H5E_BADRANGE, FAIL, "chunk too large for 32-bit length")
 #endif /* H5_SIZEOF_SIZE_T > 4 */
-            H5_ASSIGN_OVERFLOW(udata.chunk_block.length, nbytes, size_t, uint32_t);
+            H5_ASSIGN_OVERFLOW(udata.chunk_block.length, nbytes, size_t, hsize_t);
 
             /* Indicate that the chunk must be allocated */
             must_alloc = TRUE;
@@ -2729,7 +2727,8 @@ H5D__chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t
 
         /* Write the data to the file */
         HDassert(H5F_addr_defined(udata.chunk_block.offset));
-        if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.chunk_block.offset, udata.chunk_block.length, dxpl_id, buf) < 0)
+        H5_CHECK_OVERFLOW(udata.chunk_block.length, hsize_t, size_t);
+        if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.chunk_block.offset, (size_t)udata.chunk_block.length, dxpl_id, buf) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write raw data to file")
 
         /* Insert the chunk record into the index */
@@ -3798,7 +3797,7 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
      * those chunks again.
      */
     chunk_size = orig_chunk_size;
-    for(op_dim=0; op_dim<space_ndims; op_dim++) {
+    for(op_dim = 0; op_dim < space_ndims; op_dim++) {
         H5D_chunk_ud_t udata;   /* User data for querying chunk info */
         unsigned u;             /* Local index variable */
         int i;                  /* Local index variable */
@@ -4680,7 +4679,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
 
     /* Go get the rank & dimensions (including the element size) */
     space_dim = dset->shared->curr_dims;
-    space_ndims = dset->shared->ndims;;
+    space_ndims = dset->shared->ndims;
 
     /* The last dimension in chunk_offset is always 0 */
     chunk_offset[space_ndims] = (hsize_t)0;
@@ -5200,7 +5199,7 @@ H5D__chunk_update_cache(H5D_t *dset, hid_t dxpl_id)
     HDassert(dset->shared->layout.u.chunk.ndims > 0 && dset->shared->layout.u.chunk.ndims <= H5O_LAYOUT_NDIMS);
 
     /* Get the rank */
-    rank = dset->shared->layout.u.chunk.ndims-1;
+    rank = dset->shared->layout.u.chunk.ndims - 1;
     HDassert(rank > 1);
 
     /* Fill the DXPL cache values for later use */
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index 3b3fb0f..4bd6240 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -407,8 +407,7 @@ H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 	/* Allocate space for the new parts of the dataset, if appropriate */
         fill = &dataset->shared->dcpl_cache.fill;
         if(fill->alloc_time == H5D_ALLOC_TIME_EARLY)
-            if(H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_EXTEND, FALSE,
-                    old_dims) < 0)
+            if(H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_EXTEND, FALSE, old_dims) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value")
 
         /* Mark the dataspace as dirty, for later writing to the file */
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 6681d18..9435bb8 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -103,7 +103,7 @@ typedef struct H5D_type_info_t {
 
     /* Computed/derived values */
     size_t src_type_size;		/* Size of source type	*/
-    size_t dst_type_size;	        /* Size of destination type*/
+    size_t dst_type_size;	        /* Size of destination type */
     size_t max_type_size;	        /* Size of largest source/destination type */
     hbool_t is_conv_noop;               /* Whether the type conversion is a NOOP */
     hbool_t is_xform_noop;              /* Whether the data transform is a NOOP */
@@ -352,9 +352,9 @@ typedef struct H5D_chunk_info_t {
     hsize_t coords[H5O_LAYOUT_NDIMS];   /* Coordinates of chunk in file dataset's dataspace */
     hsize_t scaled[H5O_LAYOUT_NDIMS];   /* Scaled coordinates of chunk (in file dataset's dataspace) */
     H5S_t *fspace;              /* Dataspace describing chunk & selection in it */
-    unsigned fspace_shared;     /* Indicate that the file space for a chunk is shared and shouldn't be freed */
+    hbool_t fspace_shared;      /* Indicate that the file space for a chunk is shared and shouldn't be freed */
     H5S_t *mspace;              /* Dataspace describing selection in memory corresponding to this chunk */
-    unsigned mspace_shared;     /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
+    hbool_t mspace_shared;      /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
 } H5D_chunk_info_t;
 
 /* Main structure holding the mapping between file chunks and memory */
@@ -364,7 +364,6 @@ typedef struct H5D_chunk_map_t {
 
     const H5S_t *file_space;    /* Pointer to the file dataspace */
     unsigned f_ndims;           /* Number of dimensions for file dataspace */
-    hsize_t f_dims[H5O_LAYOUT_NDIMS];   /* File dataspace dimensions */
 
     const H5S_t *mem_space;     /* Pointer to the memory dataspace */
     H5S_t *mchunk_tmpl;         /* Dataspace template for new memory chunks */
diff --git a/src/H5S.c b/src/H5S.c
index 4a1783e..dd2bb0a 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -2144,14 +2144,13 @@ H5S_extend(H5S_t *space, const hsize_t *size)
     HDassert(size);
 
     /* Check through all the dimensions to see if modifying the dataspace is allowed */
-    for(u = 0; u < space->extent.rank; u++) {
-        if(space->extent.size[u]<size[u]) {
-            if(space->extent.max && H5S_UNLIMITED!=space->extent.max[u] &&
-                    space->extent.max[u]<size[u])
+    for(u = 0; u < space->extent.rank; u++)
+        if(space->extent.size[u] < size[u]) {
+            if(space->extent.max && H5S_UNLIMITED != space->extent.max[u] &&
+                    space->extent.max[u] < size[u])
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimension cannot be increased")
             ret_value++;
         } /* end if */
-    } /* end for */
 
     /* Update */
     if(ret_value) {