diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-05-28 15:01:37 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-05-28 15:01:37 (GMT) |
| commit | 0560c11c20476a8c99316bd88f1b6924afa057f9 (patch) | |
| tree | 63ee4d86f1a05c4348969e139988be0cd559be39 | |
| parent | d1feb5307de48c3d69ec8c509862714ac88ec99f (diff) | |
| download | hdf5-0560c11c20476a8c99316bd88f1b6924afa057f9.zip hdf5-0560c11c20476a8c99316bd88f1b6924afa057f9.tar.gz hdf5-0560c11c20476a8c99316bd88f1b6924afa057f9.tar.bz2 | |
[svn-r27119] handles INTEGER*16 case
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | fortran/src/H5match_types.c | 2 | ||||
| -rw-r--r-- | m4/aclocal_fc.m4 | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -7041,8 +7041,8 @@ else ENDIF IF (k .LE. 0) EXIT ENDDO - IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " - WRITE(8,'(/)') + IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " + WRITE(8,'(/)') WRITE(8,'("rk:")',ADVANCE='NO') ! Find real KINDs lastkind=SELECTED_REAL_KIND(1) DO ik=2,30 @@ -7197,8 +7197,8 @@ else ENDIF IF (k .LE. 0) EXIT ENDDO - IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " - WRITE(8,'(/)') + IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " + WRITE(8,'(/)') WRITE(8,'("rk:")',ADVANCE='NO') ! Find real KINDs lastkind=SELECTED_REAL_KIND(1) DO ik=2,30 diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c index 89ea786..35dbc19 100644 --- a/fortran/src/H5match_types.c +++ b/fortran/src/H5match_types.c @@ -131,7 +131,7 @@ void writeTypedef(const char* c_typedef, const char* c_type, int size) void writeTypedefDefault(const char* c_typedef, int size) { assert(size %2 == 0); - fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u\n", c_typedef, size / 2, c_typedef, size / 2, c_typedef, size); + fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u;\n", c_typedef, size / 2, c_typedef, size / 2, c_typedef, size); } /* Create matching Fortran and C types by writing to both files */ diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4 index 65bb817..c8db176 100644 --- a/m4/aclocal_fc.m4 +++ b/m4/aclocal_fc.m4 @@ -308,8 +308,8 @@ AC_RUN_IFELSE([ ENDIF IF (k .LE. 0) EXIT ENDDO - IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " - dnl WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " + dnl IF (k.NE.lastkind) WRITE(8,'(I0,A)',ADVANCE='NO') k, " " + IF (lastkind.NE.-1) WRITE(8,'(I0,A)',ADVANCE='NO') lastkind, " " WRITE(8,'(/)') WRITE(8,'("rk:")',ADVANCE='NO') ! Find real KINDs lastkind=SELECTED_REAL_KIND(1) |