summaryrefslogtreecommitdiffstats
path: root/test/cache_common.h
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-04 16:36:19 (GMT)
committerGitHub <noreply@github.com>2021-03-04 16:36:19 (GMT)
commit13c706d851935894db86ade76ccbea532917fcf4 (patch)
tree0b2085cdcf0189058a8273af45951b9df2d1df36 /test/cache_common.h
parent0f219cafeaa3d6755574c2fbd80292bbb513c130 (diff)
downloadhdf5-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 'test/cache_common.h')
-rw-r--r--test/cache_common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cache_common.h b/test/cache_common.h
index bc9f33b..126a8b3 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -17,8 +17,8 @@
* This file contains common #defines, type definitions, and
* externs for tests of the cache implemented in H5C.c
*/
-#ifndef _CACHE_COMMON_H
-#define _CACHE_COMMON_H
+#ifndef CACHE_COMMON_H
+#define CACHE_COMMON_H
#define H5C_FRIEND /*suppress error about including H5Cpkg */
#define H5F_FRIEND /*suppress error about including H5Fpkg */
@@ -694,4 +694,4 @@ H5TEST_DLL void dump_LRU(H5F_t * file_ptr);
}
#endif
-#endif /* _CACHE_COMMON_H */
+#endif /* CACHE_COMMON_H */