diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2020-11-17 13:47:52 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-17 13:47:52 (GMT) |
commit | 5d0be1b196570ac2c08ffe0b61ac6a45b6ab7f3f (patch) | |
tree | dbe8a76bcb211babe9900647eb1f515d8623ad9b /java/src/hdf/hdf5lib/HDF5Constants.java | |
parent | ec48fb8dfdb4f2f59f22a5efb6b950aafcac449d (diff) | |
download | hdf5-5d0be1b196570ac2c08ffe0b61ac6a45b6ab7f3f.zip hdf5-5d0be1b196570ac2c08ffe0b61ac6a45b6ab7f3f.tar.gz hdf5-5d0be1b196570ac2c08ffe0b61ac6a45b6ab7f3f.tar.bz2 |
Manual sync with develop (#95)
Brings all features from develop. Note that RELEASE.txt has not been
updated (will be done in a future PR).
Diffstat (limited to 'java/src/hdf/hdf5lib/HDF5Constants.java')
-rw-r--r-- | java/src/hdf/hdf5lib/HDF5Constants.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java index 2241238..a4f17e6 100644 --- a/java/src/hdf/hdf5lib/HDF5Constants.java +++ b/java/src/hdf/hdf5lib/HDF5Constants.java @@ -215,8 +215,8 @@ public class HDF5Constants { public static final long H5E_CANTLOAD = H5E_CANTLOAD(); /** Minor error codes - Resource errors - Unable to lock object */ public static final long H5E_CANTLOCK = H5E_CANTLOCK(); -// /** Minor error codes - File accessibility errors Unable to lock file */ -// public static final long H5E_CANTLOCKFILE = H5E_CANTLOCKFILE(); + /** Minor error codes - File accessibility errors Unable to lock file */ + public static final long H5E_CANTLOCKFILE = H5E_CANTLOCKFILE(); /** Minor error codes - Cache related errors - Unable to mark a pinned entry as clean */ public static final long H5E_CANTMARKCLEAN = H5E_CANTMARKCLEAN(); /** Minor error codes - Cache related errors - Unable to mark a pinned entry as dirty */ @@ -289,8 +289,8 @@ public class HDF5Constants { public static final long H5E_CANTUNDEPEND = H5E_CANTUNDEPEND(); /** Minor error codes - Resource errors - Unable to unlock object */ public static final long H5E_CANTUNLOCK = H5E_CANTUNLOCK(); -// /** Minor error codes - File accessibility errors Unable to unlock file */ -// public static final long H5E_CANTUNLOCKFILE = H5E_CANTUNLOCKFILE(); + /** Minor error codes - File accessibility errors Unable to unlock file */ + public static final long H5E_CANTUNLOCKFILE = H5E_CANTUNLOCKFILE(); /** Minor error codes - Cache related errors - Unable to un-pin cache entry */ public static final long H5E_CANTUNPIN = H5E_CANTUNPIN(); /** Minor error codes - Cache related errors - Unable to unprotect metadata */ @@ -1262,7 +1262,7 @@ public class HDF5Constants { private static native final long H5E_CANTLOCK(); -// private static native final long H5E_CANTLOCKFILE(); + private static native final long H5E_CANTLOCKFILE(); private static native final long H5E_CANTMARKCLEAN(); @@ -1336,7 +1336,7 @@ public class HDF5Constants { private static native final long H5E_CANTUNLOCK(); -// private static native final long H5E_CANTUNLOCKFILE(); + private static native final long H5E_CANTUNLOCKFILE(); private static native final long H5E_CANTUNPIN(); |