diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-06-11 19:18:52 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-06-11 19:18:52 (GMT) |
| commit | aa4e3e3985e1e2715819c326d332e1569ac73c7b (patch) | |
| tree | 77a9a9305e54d10f2937f142e4568395ee0f9208 /hl | |
| parent | bf8942c7e9213355515344f21c8df7fd2987f09d (diff) | |
| parent | b9f2a18b5ae9adf23cac4c0336291373a25f0721 (diff) | |
| download | hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.zip hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.gz hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.bz2 | |
[svn-r27191] Merged r26781 to r27185 from trunk
Tested on: 64-bit Ubuntu Linux VM w/ gcc 4.8.2
(C++ and Fortran 2003 also tested)
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 2 | ||||
| -rw-r--r-- | hl/test/test_dset_opt.c | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 44ec9df..6b6bc67 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -662,7 +662,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 209 +LT_VERS_REVISION = 212 LT_VERS_AGE = 0 # This is our main target diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index d8466fd..8820964 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -680,7 +680,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 209 +LT_VERS_REVISION = 212 LT_VERS_AGE = 0 # Our main target, the high-level fortran library diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 88fada8..314b11d 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -661,7 +661,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 209 +LT_VERS_REVISION = 212 LT_VERS_AGE = 0 # This library is our main target. diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c index 95ce535..a8ffa44 100644 --- a/hl/test/test_dset_opt.c +++ b/hl/test/test_dset_opt.c @@ -496,8 +496,8 @@ error: *------------------------------------------------------------------------- */ static size_t -filter_bogus1(unsigned int flags, size_t UNUSED cd_nelmts, - const unsigned int UNUSED *cd_values, size_t nbytes, +filter_bogus1(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, + const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { int *int_ptr=(int *)*buf; /* Pointer to the data values */ @@ -533,8 +533,8 @@ filter_bogus1(unsigned int flags, size_t UNUSED cd_nelmts, *------------------------------------------------------------------------- */ static size_t -filter_bogus2(unsigned int flags, size_t UNUSED cd_nelmts, - const unsigned int UNUSED *cd_values, size_t nbytes, +filter_bogus2(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts, + const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, size_t *buf_size, void **buf) { int *int_ptr=(int *)*buf; /* Pointer to the data values */ |