compile: avoid min macro pollution #942
Open
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
The generic min macro in util.h is too common and can conflict with other libraries. Rename it to nvme_min to avoid pollution. Before renaming the macro, the cpp's std::min will fail to compile. ``` ./test/cpp.cc: In function ‘int min_compile_test()’: ../src/nvme/util.h:563:19: error: expected unqualified-id before ‘(’ token 563 | #define min(x, y) ((x) > (y) ? (y) : (x)) ``` Signed-off-by: Jian Zhang <[email protected]>
igaw
reviewed
Jan 10, 2025
| @@ -560,7 +560,7 @@ char *kv_keymatch(const char *kv, const char *key); | |||
| */ | |||
| char *startswith(const char *s, const char *prefix); | |||
|
|
|||
| #define min(x, y) ((x) > (y) ? (y) : (x)) | |||
| #define nvme_min(x, y) ((x) > (y) ? (y) : (x)) | |||
There was a problem hiding this comment.
I think we should not expose this macro at all. And there should be already the min macro from the ccan 'library'. Can you drop this one and include the ccan/minmax.h header in the c files?
igaw
reviewed
Jan 10, 2025
| static int max_compile_test() | ||
| { | ||
| return std::max(1, 2); | ||
| } |
There was a problem hiding this comment.
This is unrelated with the above change.
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.
The generic min macro in util.h is too common and can conflict with other libraries. Rename it to nvme_min to avoid pollution.
Before renaming the macro, the cpp's std::min will fail to compile.