diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-06-26 14:35:07 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-06-26 14:35:07 (GMT) |
| commit | 7636342d959bfd3d023345bac76650932961d843 (patch) | |
| tree | aca513b9b30c2551e5f2d946bc180097ed4733bf /java/src/hdf | |
| parent | f89bdb7753786994887fb882c459a898b1bade63 (diff) | |
| download | hdf5-7636342d959bfd3d023345bac76650932961d843.zip hdf5-7636342d959bfd3d023345bac76650932961d843.tar.gz hdf5-7636342d959bfd3d023345bac76650932961d843.tar.bz2 | |
Push updates from develop
Diffstat (limited to 'java/src/hdf')
| -rw-r--r-- | java/src/hdf/hdf5lib/HDF5Constants.java | 3 | ||||
| -rw-r--r-- | java/src/hdf/hdf5lib/HDFArray.java | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java index 43109f2..7eddac0 100644 --- a/java/src/hdf/hdf5lib/HDF5Constants.java +++ b/java/src/hdf/hdf5lib/HDF5Constants.java @@ -623,6 +623,7 @@ public class HDF5Constants { public static final long H5T_UNIX_D64LE = H5T_UNIX_D64LE(); public static final long H5T_VARIABLE = H5T_VARIABLE(); public static final int H5T_VLEN = H5T_VLEN(); + public static final int H5T_VL_T = H5T_VL_T(); public static final int H5Z_CB_CONT = H5Z_CB_CONT(); public static final int H5Z_CB_ERROR = H5Z_CB_ERROR(); public static final int H5Z_CB_FAIL = H5Z_CB_FAIL(); @@ -1825,6 +1826,8 @@ public class HDF5Constants { private static native final int H5T_VLEN(); + private static native final int H5T_VL_T(); + private static native final int H5Z_CB_CONT(); private static native final int H5Z_CB_ERROR(); diff --git a/java/src/hdf/hdf5lib/HDFArray.java b/java/src/hdf/hdf5lib/HDFArray.java index 529aecb..30f0fc8 100644 --- a/java/src/hdf/hdf5lib/HDFArray.java +++ b/java/src/hdf/hdf5lib/HDFArray.java @@ -1025,8 +1025,11 @@ class ArrayDescriptor { NTsize = 8; } else if (css.startsWith("Ljava.lang.String")) { + NT = 'L'; + className = "java.lang.String"; + NTsize = 1; throw new HDF5JavaException(new String( - "ArrayDesciptor: Error: String array not supported yet")); + "ArrayDesciptor: Warning: String array not fully supported yet")); } else { /* |