Repository navigation
COMP: Rename the simplnx HDF5 lock macro to remove a name conflict - #1961
Closed
imikejackson wants to merge 1 commit into
Closed
imikejackson wants to merge 1 commit into
imikejackson wants to merge 1 commit into
Conversation
* simplnx defined H5SUPPORT_MUTEX_LOCK() and the compile definition H5Support_USE_MUTEX. The H5Support library defines a macro with the same name in H5Support/H5Support.h. When one file included both headers, the compiler gave a macro redefinition warning, and the definition that the compiler used depended on the include order. * The simplnx macro is now SIMPLNX_H5SUPPORT_MUTEX_LOCK(), and the compile definition is now SIMPLNX_H5Support_USE_MUTEX. * The names are changed in CMakeLists.txt, H5Support.hpp, H5Support.cpp and test/H5Test.cpp. No other code changes. Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
imikejackson
force-pushed
the
topic/rename_simplnx_h5support_mutex_macro
branch
from
November 12, 2026 15:18
f4c5f6d to
df34f41
Compare
4 of 7 tasks
Contributor
Author
|
Closed in favor of #1973, which merges this branch (with its history) together with the other EBSD fixes that need the next EbsdLib release (BlueQuartzSoftware/EbsdLib#86). The branch is kept. 🤖 Generated with Claude Code |
This was referenced Nov 13, 2026
imikejackson
added a commit
to imikejackson/simplnx
that referenced
this pull request
Nov 14, 2026
…lueQuartzSoftware#1961) Originally simplnx BlueQuartzSoftware#1961 (branch topic/rename_simplnx_h5support_mutex_macro), combined into this branch for the EbsdLib 3.1.4 update. Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
simplnx defined the macro
H5SUPPORT_MUTEX_LOCK()and the compile definitionH5Support_USE_MUTEX. The H5Support library defines a macro with the same name inH5Support/H5Support.h. When one file included both headers, the compiler gave a macro redefinition warning. The definition that the compiler used depended on the include order.This pull request gives the simplnx names a
SIMPLNX_prefix, so that they do not conflict with the H5Support library.H5SUPPORT_MUTEX_LOCK()is nowSIMPLNX_H5SUPPORT_MUTEX_LOCK().H5Support_USE_MUTEXis nowSIMPLNX_H5Support_USE_MUTEX.CMakeLists.txt,H5Support.hpp,H5Support.cppandtest/H5Test.cpp. There are no other code changes.Test Plan
simplnx,simplnx_test,OrientationAnalysisand test targets build with 0-Wmacro-redefinedwarnings. The testHDF5 ApiLock serializes access via SIMPLNX_H5SUPPORT_MUTEX_LOCKpasses. This build also had other uncommitted changes that do not touch these four files.Related Issue