diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-03-21 17:07:42 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-03-21 17:07:42 (GMT) |
| commit | f09abb150e965200ac1b06a5bc4b374d8969776c (patch) | |
| tree | aaacae8b1bad787d0e340772ced6839fc612b935 /java | |
| parent | 2fe63888b73c7d857bdcd7e67af3e7c3d13018cf (diff) | |
| parent | fa5ca5272d7aa6f25656541b72a24697b36dd52b (diff) | |
| download | hdf5-f09abb150e965200ac1b06a5bc4b374d8969776c.zip hdf5-f09abb150e965200ac1b06a5bc4b374d8969776c.tar.gz hdf5-f09abb150e965200ac1b06a5bc4b374d8969776c.tar.bz2 | |
Merge pull request #356 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fa5ca5272d7aa6f25656541b72a24697b36dd52b':
Remove extra space added by h5vers to version string in H5.java, which then failed to match the pattern after the first run.
Remove incorrect " marks added to java files by bin/h5vers. Pull version from configure for version test in h5repack_plugin.sh.in
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/hdf/hdf5lib/H5.java | 4 | ||||
| -rw-r--r-- | java/test/TestH5.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 16b28fa..a1099d8 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -216,7 +216,7 @@ import hdf.hdf5lib.structs.H5O_info_t; * exception handlers to print out the HDF-5 error stack. * <hr> * - * * * * * * * * * * * * * @version HDF5 "1.11.0" <BR> + * @version HDF5 1.11.0 <BR> * <b>See also: <a href ="./hdf.hdf5lib.HDFArray.html"> hdf.hdf5lib.HDFArray</a> </b><BR> * <a href ="./hdf.hdf5lib.HDF5Constants.html"> hdf.hdf5lib.HDF5Constants</a><BR> * <a href ="./hdf.hdf5lib.HDF5CDataTypes.html"> hdf.hdf5lib.HDF5CDataTypes</a><BR> @@ -239,7 +239,7 @@ public class H5 implements java.io.Serializable { * * Make sure to update the versions number when a different library is used. */ - public final static int LIB_VERSION[] = { "1, 10, 1" }; + public final static int LIB_VERSION[] = { 1, 11, 0 }; public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib"; diff --git a/java/test/TestH5.java b/java/test/TestH5.java index 173af8f..4c84988 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -164,7 +164,7 @@ public class TestH5 { */ @Test public void testH5get_libversion() { - int libversion[] = { "1, 11, 0" }; + int libversion[] = { 1, 11, 0 }; try { H5.H5get_libversion(libversion); @@ -186,7 +186,7 @@ public class TestH5 { */ @Test public void testH5check_version() { - "int majnum = 1, minnum = 10, relnum = 1"; + int majnum = 1, minnum = 11, relnum = 0; try { H5.H5check_version(majnum, minnum, relnum); |