Using FMT_NULLPTR instead of literal 0 #409
Merged
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
foonathan
reviewed
Nov 2, 2016
| @@ -748,7 +758,7 @@ void MemoryBuffer<T, SIZE, Allocator>::grow(std::size_t size) { | |||
| std::size_t new_capacity = this->capacity_ + this->capacity_ / 2; | |||
| if (size > new_capacity) | |||
| new_capacity = size; | |||
| T *new_ptr = this->allocate(new_capacity); | |||
There was a problem hiding this comment.
You've added a second argument here for some reason that causes compilation errors.
There was a problem hiding this comment.
See http://en.cppreference.com/w/cpp/memory/allocator/allocate
Second argument is defaulted to literal 0 and causes a warning when -Wzero-as-null-pointer-constant diagnostic enabled.
I presume compilation error happens in mock-allocator.h?
If so, just adding a dummy parameter to its allocate() will fix that (and also will make that mock more conformant).
|
Nice! Thanks for working on it (and @foonathan for reviewing). |
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.
Based on issue 408
I've added FMT_NULLPTR macro (similar to other emulated language features there) that would expand to NULL or nullptr if available, as gcc isn't happy even with NULL in some cases.
Also added a couple of FMT_OVERRIDE where necessary.