Rename unexpected to UNEXPECTED to prevent clashing with std::unexpected - #314
Open
mikomikotaishi wants to merge 2 commits into
Open
Rename unexpected to UNEXPECTED to prevent clashing with std::unexpected#314mikomikotaishi wants to merge 2 commits into
unexpected to UNEXPECTED to prevent clashing with std::unexpected#314mikomikotaishi wants to merge 2 commits into
Conversation
mikomikotaishi
force-pushed
the
chore/rename-unexpected
branch
3 times, most recently
from
August 24, 2026 22:22
d9da8ba to
666b1c1
Compare
mikomikotaishi
changed the title
unexpected to case_unexpected to prevent clashing with stdunexpected to condition_unlikely to prevent clashing with std::unexpected
mikomikotaishi
changed the title
unexpected to condition_unlikely to prevent clashing with std::unexpectedunexpected to UNEXPECTED to prevent clashing with std::unexpected
mikomikotaishi
force-pushed
the
chore/rename-unexpected
branch
3 times, most recently
from
September 10, 2026 01:04
5489fd0 to
54b5464
Compare
mikomikotaishi
force-pushed
the
chore/rename-unexpected
branch
2 times, most recently
from
September 10, 2026 01:06
de82872 to
5b071ac
Compare
mikomikotaishi
force-pushed
the
chore/rename-unexpected
branch
from
September 10, 2026 01:06
5b071ac to
8e7fa28
Compare
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
1 participant
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.
This PR renames the
unexpectedmacro tocondition_unlikelyUNEXPECTED. Because C++23 reintroduces the namestd::unexpected<E>, this change is needed to remove the possibility of clashing with the standard on later versions.condition_unlikelyseems like a more reasonable name, because rather than implying that it should never be expected, it indicates what the hot paths ([[likely]]/[[unlikely]]attributes) are.CXXFLAGS += -D_GLIBCXX_USE_DEPRECATED=0was done originally to eliminate the deprecatedstd::unexpected()(deprecated in C++11 and removed in C++17). Because the macro has been renamed, this is no longer needed.It was pointed out that the codebase cannot move forward to C++23 (until dropping support for Windows XP or changing the build system). At the very least, this change serves as future-proofing and allows the Makefile to be simplified by dropping the disabled
GLIBCXX_USE_DEPRECATEDoption.