summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2017-10-27 14:45:59 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2017-10-27 14:45:59 (GMT)
commit42cdbb9e71ab6fe74196f361ce2b1a6eb92a5245 (patch)
treea21dacfb2b1ae31e31c6e1775c00859ee29b65bf
parent7bfab2c15371f666fc7238a5ce246a507ab722d5 (diff)
parent89cfc8617c6dd0fd89c73e40a1b2993bff13858a (diff)
downloadhdf5-42cdbb9e71ab6fe74196f361ce2b1a6eb92a5245.zip
hdf5-42cdbb9e71ab6fe74196f361ce2b1a6eb92a5245.tar.gz
hdf5-42cdbb9e71ab6fe74196f361ce2b1a6eb92a5245.tar.bz2
Merge pull request #735 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_8 to hdf5_1_8
* commit '89cfc8617c6dd0fd89c73e40a1b2993bff13858a': updated configure changes with bin/reconfig
-rwxr-xr-xconfigure2
-rw-r--r--hl/src/H5LTparse.c144
-rw-r--r--hl/src/H5LTparse.h4
3 files changed, 75 insertions, 75 deletions
diff --git a/configure b/configure
index f581c44..0859d57 100755
--- a/configure
+++ b/configure
@@ -33750,7 +33750,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
case "`uname`" in
Linux*)
if test "X$FC_BASENAME" = "Xnagfor"; then
- cat libtool | awk '/NAG_Fortran/{flag=1}flag&&/wl=/{$NF="wl=\"-Wl,Wl,,\"";flag=0}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool
+ cat libtool | awk '/BEGIN LIBTOOL TAG CONFIG: FC/{flag=1}flag&&/wl=/{$NF="wl=\"-Wl,-Wl,,\"";flag=0}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool
fi
;;
esac
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 2a0f267..16a0bcf 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 99 "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 100 "H5LTparse.y"
{ return (yyval.hid);}
break;
case 13:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 114 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
break;
case 14:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 115 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
break;
case 15:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 116 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
break;
case 16:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 117 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
break;
case 17:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 118 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
break;
case 18:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 119 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
break;
case 19:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 120 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
break;
case 20:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 121 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
break;
case 21:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 122 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
break;
case 22:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 123 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
break;
case 23:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 124 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
break;
case 24:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 125 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
break;
case 25:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 126 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
break;
case 26:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 127 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
break;
case 27:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 128 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
break;
case 28:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 129 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
break;
case 29:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 130 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
break;
case 30:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 131 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
break;
case 31:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 132 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
break;
case 32:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 133 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
break;
case 33:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 134 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
break;
case 34:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 135 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
break;
case 35:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 136 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
break;
case 36:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 137 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
break;
case 37:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 138 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
break;
case 38:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 139 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
break;
case 39:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 140 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
break;
case 40:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 143 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
break;
case 41:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 144 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
break;
case 42:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 145 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
break;
case 43:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 146 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
break;
case 44:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 147 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
break;
case 45:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 148 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
break;
case 46:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 149 "H5LTparse.y"
{ (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
break;
case 47:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 153 "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 155 "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 164 "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 166 "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 199 "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 204 "H5LTparse.y"
{ (yyval.ival) = 0; }
break;
case 55:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 206 "H5LTparse.y"
{ (yyval.ival) = yylval.ival; }
break;
case 57:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 210 "H5LTparse.y"
{ asindex++; /*pushd onto the stack*/ }
break;
case 58:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 212 "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 222 "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 223 "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 234 "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 239 "H5LTparse.y"
{ is_opq_size = 1; }
break;
case 67:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 240 "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 245 "H5LTparse.y"
{ is_opq_tag = 1; }
break;
case 69:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 246 "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 250 "H5LTparse.y"
{ (yyval.hid) = (yyvsp[(7) - (15)].hid); }
break;
case 73:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 258 "H5LTparse.y"
{ is_str_size = 1; }
break;
case 74:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 259 "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 267 "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 276 "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 283 "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 290 "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 307 "H5LTparse.y"
{(yyval.ival) = H5T_VARIABLE_TOKEN;}
break;
case 81:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 310 "H5LTparse.y"
{(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
break;
case 82:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 311 "H5LTparse.y"
{(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
break;
case 83:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 312 "H5LTparse.y"
{(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
break;
case 84:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 314 "H5LTparse.y"
{(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
break;
case 85:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 315 "H5LTparse.y"
{(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
break;
case 86:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 317 "H5LTparse.y"
{(yyval.hid) = H5T_C_S1_TOKEN;}
break;
case 87:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 318 "H5LTparse.y"
{(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
break;
case 88:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 322 "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 324 "H5LTparse.y"
{ is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
break;
case 92:
-/* Line 1807 of yacc.c */
+/* Line 1792 of yacc.c */
#line 329 "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 338 "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 2af0172..7481a45 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 66 "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