diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-04 20:22:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-04 20:22:07 (GMT) |
| commit | f679c6ea28599669a3961068b04b415377c64b8b (patch) | |
| tree | 4cd8182ec3bd9d48f2070a149c8f45602a983ee8 | |
| parent | 6d15c45225e6b5202a4c1cfba2587ec0021de666 (diff) | |
| download | hdf5-f679c6ea28599669a3961068b04b415377c64b8b.zip hdf5-f679c6ea28599669a3961068b04b415377c64b8b.tar.gz hdf5-f679c6ea28599669a3961068b04b415377c64b8b.tar.bz2 | |
Small doxygen fixes plus simple doc fixes (#989)
Change doxygen generated file location
Clang format override for flags
| -rw-r--r-- | config/cmake/README.txt.cmake.in | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/H5Opublic.h | 16 |
4 files changed, 9 insertions, 12 deletions
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in index f621515..9289870 100644 --- a/config/cmake/README.txt.cmake.in +++ b/config/cmake/README.txt.cmake.in @@ -75,6 +75,6 @@ For more information see USING_CMake_Examples.txt in the install folder. =========================================================================== Documentation for this release can be found at the following URL: - https://portal.hdfgroup.org/display/support + https://portal.hdfgroup.org/display/HDF5/HDF5 Bugs should be reported to help@hdfgroup.org. diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 86074d0..29600bd 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -745,7 +745,6 @@ New Features Fortran Library: ---------------- - - H5Fget_name_f fixed to handle correctly trailing whitespaces and newly allocated buffers. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1e3c626..d1d848d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1416,7 +1416,7 @@ if (DOXYGEN_FOUND) set (DOXYGEN_HTML_FOOTER ${HDF5_DOXYGEN_DIR}/hdf5_footer.html) set (DOXYGEN_HTML_EXTRA_STYLESHEET ${HDF5_DOXYGEN_DIR}/hdf5doxy.css) set (DOXYGEN_HTML_EXTRA_FILES "${HDF5_DOXYGEN_DIR}/hdf5_navtree_hacks.js ${HDF5_DOXYGEN_DIR}/img/ftv2node.png ${HDF5_DOXYGEN_DIR}/img/ftv2pnode.png") - set (DOXYGEN_TAG_FILE ${HDF5_DOXYGEN_DIR}/hdf5.tag) + set (DOXYGEN_TAG_FILE ${HDF5_BINARY_DIR}/hdf5.tag) set (DOXYGEN_SERVER_BASED_SEARCH NO) set (DOXYGEN_EXTERNAL_SEARCH NO) set (DOXYGEN_SEARCHENGINE_URL) diff --git a/src/H5Opublic.h b/src/H5Opublic.h index 0fcedb2..d9d0500 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -61,19 +61,17 @@ (H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_FILL_FLAG | H5O_SHMESG_PLINE_FLAG | \ H5O_SHMESG_ATTR_FLAG) +/* clang-format off */ /* Object header status flag definitions */ -#define H5O_HDR_CHUNK0_SIZE \ - 0x03 /**< 2-bit field indicating # of bytes to store the size of chunk 0's data \ - */ -#define H5O_HDR_ATTR_CRT_ORDER_TRACKED 0x04 /**< Attribute creation order is tracked */ -#define H5O_HDR_ATTR_CRT_ORDER_INDEXED 0x08 /**< Attribute creation order has index */ -#define H5O_HDR_ATTR_STORE_PHASE_CHANGE \ - 0x10 /**< Non-default attribute storage phase change values stored \ - */ -#define H5O_HDR_STORE_TIMES 0x20 /**< Store access, modification, change & birth times for object */ +#define H5O_HDR_CHUNK0_SIZE 0x03 /**< 2-bit field indicating # of bytes to store the size of chunk 0's data */ +#define H5O_HDR_ATTR_CRT_ORDER_TRACKED 0x04 /**< Attribute creation order is tracked */ +#define H5O_HDR_ATTR_CRT_ORDER_INDEXED 0x08 /**< Attribute creation order has index */ +#define H5O_HDR_ATTR_STORE_PHASE_CHANGE 0x10 /**< Non-default attribute storage phase change values stored */ +#define H5O_HDR_STORE_TIMES 0x20 /**< Store access, modification, change & birth times for object */ #define H5O_HDR_ALL_FLAGS \ (H5O_HDR_CHUNK0_SIZE | H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | \ H5O_HDR_ATTR_STORE_PHASE_CHANGE | H5O_HDR_STORE_TIMES) +/* clang-format on */ /* Maximum shared message values. Number of indexes is 8 to allow room to add * new types of messages. |