ci: Rename macro to avoid conflict during CI unity builds #4092
Conversation
This file contains 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
Signed-off-by: Larry Gritz <lg@larrygritz.com>
|
Preemptively merging since it's just an internal macro rename confined to one source file, and it fixes a broken CI for something I want to submit. |
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Dec 24, 2023
…twareFoundation#4092) Unity builds (which we do for CI to speed it up) combine source files, sometimes in ways that are a bit non-deterministic, and can run into violations of the ODR that were not a problem when separate definitions of the same thing (a macro in this case) were in different compilation units but are in the same one as a unity build. In this case, a private OIIO_DISPATCH_TYPES macro in printinfo.cpp conflicted with a different macro of the same name in imagebufalgo_util.h. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1div0
pushed a commit
to 1div0/OpenImageIO
that referenced
this pull request
Feb 24, 2024
…twareFoundation#4092) Unity builds (which we do for CI to speed it up) combine source files, sometimes in ways that are a bit non-deterministic, and can run into violations of the ODR that were not a problem when separate definitions of the same thing (a macro in this case) were in different compilation units but are in the same one as a unity build. In this case, a private OIIO_DISPATCH_TYPES macro in printinfo.cpp conflicted with a different macro of the same name in imagebufalgo_util.h. Signed-off-by: Larry Gritz <lg@larrygritz.com> Signed-off-by: Peter Kovář <peter.kovar@reflexion.tv>
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.
Unity builds (which we do for CI to speed it up) combine source files,
sometimes in ways that are a bit non-deterministic, and can run into
violations of the ODR that were not a problem when separate definitions
of the same thing (a macro in this case) were in different compilation
units but are in the same one as a unity build.
In this case, a private OIIO_DISPATCH_TYPES macro in printinfo.cpp
conflicted with a different macro of the same name in imagebufalgo_util.h.