FMT_VARIADIC_CONST - Support for const variadic methods #591
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
vitaut
requested changes
Oct 22, 2017
There was a problem hiding this comment.
Looks good, but could you format the code according to the coding style: Please format according to our coding style: https://github.com/fmtlib/fmt/blob/master/CONTRIBUTING.rst (mostly Google style).
Thanks for contributing!
fmt/format.h
Outdated
| @@ -3647,35 +3647,35 @@ void arg(WStringRef, const internal::NamedArg<Char>&) FMT_DELETED_OR_UNDEFINED; | |||
| #else | |||
| // Defines a wrapper for a function taking __VA_ARGS__ arguments | |||
| // and n additional arguments of arbitrary types. | |||
| # define FMT_WRAP(Char, ReturnType, func, call, n, ...) \ | |||
| # define FMT_WRAP(Const,Char, ReturnType, func, call, n, ...) \ | |||
fmt/format.h
Outdated
| fmt::internal::ArgArray<n>::Type arr; \ | ||
| FMT_GEN(n, FMT_ASSIGN_##Char); \ | ||
| call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList( \ | ||
| fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), arr)); \ | ||
| } | ||
|
|
||
| # define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \ | ||
| inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__)) { \ | ||
| # define FMT_VARIADIC_(Const,Char, ReturnType, func, call, ...) \ |
fmt/format.h
Outdated
| @@ -3706,10 +3706,16 @@ void arg(WStringRef, const internal::NamedArg<Char>&) FMT_DELETED_OR_UNDEFINED; | |||
| \endrst | |||
| */ | |||
| #define FMT_VARIADIC(ReturnType, func, ...) \ | |||
| FMT_VARIADIC_(char, ReturnType, func, return func, __VA_ARGS__) | |||
| FMT_VARIADIC_(,char, ReturnType, func, return func, __VA_ARGS__) | |||
|
Sure, done. Sorry for this, I overlooked it. |
vitaut
reviewed
Oct 22, 2017
test/format-test.cc
Outdated
| TEST(FormatTest, ConstFormatMessage) { | ||
| test_class c; | ||
| EXPECT_EQ("[42] something happened", | ||
| c.format_message(42, "{} happened", "something")); |
There was a problem hiding this comment.
nit: Please use 2-space indent instead of tabs.
There was a problem hiding this comment.
Done. It's interesting because it's copy-paste from your code. Visual studio had to reformat it.
|
Merged, thanks! |
|
You're welcome. And thank you for your patience, this was my first public PR ;-) |
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.
Implementation of FMT_VARIDIC_CONST as discussed here #589