Merge branch 'develop' into parallel_vds_develop

4 files changed, 154 insertions, 49 deletions

diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 248e654..80adffb 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -149,6 +149,9 @@ Java_hdf_hdf5lib_H5_H5Fis_1hdf5
     (JNIEnv *env, jclass clss, jstring name)
 {
     htri_t      bval = JNI_FALSE;
+#ifdef H5_NO_DEPRECATED_SYMBOLS
+    h5unimplemented(env, "H5Fis_hdf5:  not implemented");
+#else
     const char *fileName;
 
     PIN_JAVA_STRING(name, fileName);
@@ -162,7 +165,7 @@ Java_hdf_hdf5lib_H5_H5Fis_1hdf5
         else if (bval < 0)
             h5libraryError(env);
     }
-
+#endif
     return (jboolean)bval;
 } /* end Java_hdf_hdf5lib_H5_H5Fis_1hdf5 */
 
@@ -636,6 +639,66 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
     } /* end else */
 } /* end Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status */
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Fset_dset_no_attrs_hint
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint
+(JNIEnv *env, jclass clss, jlong file_id, jboolean minimize)
+{
+    herr_t   retVal = -1;
+    hbool_t  minimize_val;
+
+    if (minimize == JNI_TRUE)
+        minimize_val = TRUE;
+    else
+        minimize_val = FALSE;
+
+    retVal = H5Fset_dset_no_attrs_hint((hid_t)file_id, (hbool_t)minimize_val);
+    if (retVal < 0)
+        h5libraryError(env);
+}
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Fget_dset_no_attrs_hint
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint
+(JNIEnv *env, jclass clss, jlong file_id)
+{
+    hbool_t    minimize = FALSE;
+    jboolean  bval = JNI_FALSE;
+
+    if (H5Fget_dset_no_attrs_hint((hid_t)file_id, (hbool_t *)&minimize) < 0) {
+        h5libraryError(env);
+    }
+    else {
+        if (minimize == TRUE)
+            bval =  JNI_TRUE;
+    } /* end else */
+
+    return bval;
+}
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Fset_libver_bounds
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds
+    (JNIEnv *env, jclass clss, jlong file_id, jint low, jint high)
+{
+    herr_t retVal = -1;
+
+    retVal = H5Fset_libver_bounds((hid_t)file_id, (H5F_libver_t)low, (H5F_libver_t)high);
+    if(retVal < 0)
+        h5libraryError(env);
+} /* end Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds */
 
 
 #ifdef __cplusplus
diff --git a/java/src/jni/h5fImp.h b/java/src/jni/h5fImp.h
index af0fa1d..fe253f9 100644
--- a/java/src/jni/h5fImp.h
+++ b/java/src/jni/h5fImp.h
@@ -255,6 +255,33 @@ JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
   (JNIEnv *, jclass, jlong, jbooleanArray);
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Fset_dset_no_attrs_hint
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint
+  (JNIEnv *, jclass, jlong, jboolean);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Fget_dset_no_attrs_hint
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Fset_libver_bounds
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds
+(JNIEnv *, jclass, jlong, jint, jint);
+
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index 52008ce..ac21d1d 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -134,45 +134,6 @@ Java_hdf_hdf5lib_H5__1H5Pcopy
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Pget_version
- * Signature: (J[I)I
- */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1version
-    (JNIEnv *env, jclass clss, jlong plist, jintArray version_info)
-{
-    herr_t   status = -1;
-    jint    *theArray;
-    jboolean isCopy;
-
-    if (version_info == NULL) {
-        h5nullArgument(env, "H5Pget_version:  version_info input array is NULL");
-    } /* end if */
-    else if (ENVPTR->GetArrayLength(ENVPAR version_info) < 4) {
-        h5badArgument(env, "H5Pget_version:  version_info input array < 4");
-    } /* end else if */
-    else {
-        theArray = (jint *)ENVPTR->GetIntArrayElements(ENVPAR version_info, &isCopy);
-        if (theArray == NULL) {
-            h5JNIFatalError(env, "H5Pget_version:  version_info not pinned");
-        } /* end if */
-        else {
-            status = H5Pget_version((hid_t)plist, (unsigned *)&(theArray[0]),
-                    (unsigned *)&(theArray[1]), (unsigned *)&(theArray[2]), (unsigned *)&(theArray[3]));
-            if (status < 0) {
-                ENVPTR->ReleaseIntArrayElements(ENVPAR version_info, theArray, JNI_ABORT);
-                h5libraryError(env);
-            } /* end if */
-            else
-                ENVPTR->ReleaseIntArrayElements(ENVPAR version_info, theArray, 0);
-        } /* end else */
-    } /* end else */
-
-    return (jint)status;
-} /* end Java_hdf_hdf5lib_H5_H5Pget_1version */
-
-/*
- * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_userblock
  * Signature: (JJ)I
  */
@@ -5946,6 +5907,51 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts
     return (jint)opts;
 } /* end Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts */
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_dset_no_attrs_hint
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint
+(JNIEnv *env, jclass clss, jlong dcpl_id, jboolean minimize)
+{
+    herr_t   retVal = -1;
+    hbool_t  minimize_val;
+
+    if (minimize == JNI_TRUE)
+        minimize_val = TRUE;
+    else
+        minimize_val = FALSE;
+
+    retVal = H5Pset_dset_no_attrs_hint((hid_t)dcpl_id, (hbool_t)minimize_val);
+    if (retVal < 0)
+        h5libraryError(env);
+}
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_dset_no_attrs_hint
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint
+(JNIEnv *env, jclass clss, jlong dcpl_id)
+{
+    hbool_t    minimize = FALSE;
+    jboolean  bval = JNI_FALSE;
+
+    if (H5Pget_dset_no_attrs_hint((hid_t)dcpl_id, (hbool_t *)&minimize) < 0) {
+        h5libraryError(env);
+    }
+    else {
+        if (minimize == TRUE)
+            bval =  JNI_TRUE;
+    } /* end else */
+
+    return bval;
+}
+
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5pImp.h b/java/src/jni/h5pImp.h
index 1d12e3d..056c569 100644
--- a/java/src/jni/h5pImp.h
+++ b/java/src/jni/h5pImp.h
@@ -59,15 +59,6 @@ Java_hdf_hdf5lib_H5__1H5Pcopy
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Pget_version
- * Signature: (J[I)I
- */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1version
-(JNIEnv *, jclass, jlong, jintArray);
-
-/*
- * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_userblock
  * Signature: (JJ)I
  */
@@ -1614,6 +1605,24 @@ JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts
 (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_dset_no_attrs_hint
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint
+  (JNIEnv *, jclass, jlong, jboolean);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_dset_no_attrs_hint
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint
+  (JNIEnv *, jclass, jlong);
+
 
 #ifdef __cplusplus
 } /* end extern "C" */