diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
| commit | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (patch) | |
| tree | 3b7ce8804ae917fd71e995a39b4ccb08d2aa7169 /java/src/hdf/hdf5lib/HDF5Constants.java | |
| parent | 156baee37112996291f9ff07760be047d0e03c76 (diff) | |
| parent | 71b817038d8cd82163cf71119873b2ba65a2c81b (diff) | |
| download | hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.zip hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.gz hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.bz2 | |
merge and fix conflicts
Diffstat (limited to 'java/src/hdf/hdf5lib/HDF5Constants.java')
| -rw-r--r-- | java/src/hdf/hdf5lib/HDF5Constants.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java index f5be38d..4aeeb98 100644 --- a/java/src/hdf/hdf5lib/HDF5Constants.java +++ b/java/src/hdf/hdf5lib/HDF5Constants.java @@ -407,11 +407,18 @@ public class HDF5Constants { public static final int H5PL_VOL_PLUGIN = H5PL_VOL_PLUGIN(); public static final int H5PL_ALL_PLUGIN = H5PL_ALL_PLUGIN(); + public static final int H5R_ATTR = H5R_ATTR(); public static final int H5R_BADTYPE = H5R_BADTYPE(); public static final int H5R_DATASET_REGION = H5R_DATASET_REGION(); + public static final int H5R_DATASET_REGION1 = H5R_DATASET_REGION1(); + public static final int H5R_DATASET_REGION2 = H5R_DATASET_REGION2(); public static final int H5R_MAXTYPE = H5R_MAXTYPE(); + public static final int H5R_REF_BUF_SIZE = H5R_REF_BUF_SIZE(); public static final int H5R_OBJ_REF_BUF_SIZE = H5R_OBJ_REF_BUF_SIZE(); public static final int H5R_OBJECT = H5R_OBJECT(); + public static final int H5R_OBJECT1 = H5R_OBJECT1(); + public static final int H5R_OBJECT2 = H5R_OBJECT2(); + public static final int H5S_ALL = H5S_ALL(); public static final int H5S_MAX_RANK = H5S_MAX_RANK(); public static final int H5S_NO_CLASS = H5S_NO_CLASS(); @@ -606,6 +613,7 @@ public class HDF5Constants { public static final long H5T_STD_I8LE = H5T_STD_I8LE(); public static final long H5T_STD_REF_DSETREG = H5T_STD_REF_DSETREG(); public static final long H5T_STD_REF_OBJ = H5T_STD_REF_OBJ(); + public static final long H5T_STD_REF = H5T_STD_REF(); public static final long H5T_STD_U16BE = H5T_STD_U16BE(); public static final long H5T_STD_U16LE = H5T_STD_U16LE(); public static final long H5T_STD_U32BE = H5T_STD_U32BE(); @@ -1420,16 +1428,28 @@ public class HDF5Constants { private static native final int H5PL_VOL_PLUGIN(); + private static native final int H5R_ATTR(); + private static native final int H5R_BADTYPE(); private static native final int H5R_DATASET_REGION(); + private static native final int H5R_DATASET_REGION1(); + + private static native final int H5R_DATASET_REGION2(); + private static native final int H5R_MAXTYPE(); + private static native final int H5R_REF_BUF_SIZE(); + private static native final int H5R_OBJ_REF_BUF_SIZE(); private static native final int H5R_OBJECT(); + private static native final int H5R_OBJECT1(); + + private static native final int H5R_OBJECT2(); + private static native final int H5S_ALL(); private static native final int H5S_MAX_RANK(); @@ -1818,6 +1838,8 @@ public class HDF5Constants { private static native final long H5T_STD_REF_OBJ(); + private static native final long H5T_STD_REF(); + private static native final long H5T_STD_U16BE(); private static native final long H5T_STD_U16LE(); |