diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-04 16:36:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 16:36:19 (GMT) |
| commit | 13c706d851935894db86ade76ccbea532917fcf4 (patch) | |
| tree | 0b2085cdcf0189058a8273af45951b9df2d1df36 /java/src/jni/h5pImp.h | |
| parent | 0f219cafeaa3d6755574c2fbd80292bbb513c130 (diff) | |
| download | hdf5-13c706d851935894db86ade76ccbea532917fcf4.zip hdf5-13c706d851935894db86ade76ccbea532917fcf4.tar.gz hdf5-13c706d851935894db86ade76ccbea532917fcf4.tar.bz2 | |
1 12 Merges from develop (#421)
* OESS-98 fix tools test for plugins
* sync fork
* Merge of changes from dev
* Move problem option to bottom of the list until fixed
* HDFFV-11106 - fix parsing optional args
* HDFFV-11106 add note
* grammer fix
* Whitespace after clang formatting
* Undo format version 11 changes
* Update check to working version
* Merge workflow and minor changes from develop
* Update supported platforms
* PR#3 merge from develop
* Merge gcc 10 diagnostics option from develop
* Merge #318 OSX changes from develop
* Merge serval small changes from dev
* fix typo
* Minor non-space formatting changes
* GH #386 copyright corrections for java folder
* revert because logic requires false return
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Remove case statement for H5I_EVENTSET
* Correct call with versioning
* Remove tabs
* Double underscore change
* Merges from develop
#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards
Diffstat (limited to 'java/src/jni/h5pImp.h')
| -rw-r--r-- | java/src/jni/h5pImp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/jni/h5pImp.h b/java/src/jni/h5pImp.h index b80ce46..189e9d7 100644 --- a/java/src/jni/h5pImp.h +++ b/java/src/jni/h5pImp.h @@ -12,8 +12,8 @@ /* Header for class hdf_hdf5lib_H5_H5_H5P */ -#ifndef _Included_hdf_hdf5lib_H5_H5P -#define _Included_hdf_hdf5lib_H5_H5P +#ifndef Included_hdf_hdf5lib_H5_H5P +#define Included_hdf_hdf5lib_H5_H5P #include <jni.h> @@ -210,4 +210,4 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Pclose_1class(JNIEnv *, jclass, j } /* end extern "C" */ #endif /* __cplusplus */ -#endif /* _Included_hdf_hdf5lib_H5_H5P */ +#endif /* Included_hdf_hdf5lib_H5_H5P */ |