rgw: cleanup MIN macro with std::min #17546
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
|
Jenkins，retest this please. |
|
Jenkins，retest this please. |
theanalyst
approved these changes
Sep 11, 2017
|
@cbodley ping |
cbodley
reviewed
Oct 16, 2017
src/rgw/rgw_rados.cc
Outdated
| @@ -2074,12 +2074,12 @@ void RGWObjManifest::obj_iterator::operator++() | |||
| if (ofs < head_size) { | |||
| rule_iter = manifest->rules.begin(); | |||
| RGWObjManifestRule *rule = &rule_iter->second; | |||
| ofs = MIN(head_size, obj_size); | |||
| ofs = min(head_size, obj_size); | |||
There was a problem hiding this comment.
can you please qualify these ones with std:: also?
mikulely
force-pushed
the
rgw-cleanup-min
branch
from
f97eb0d
to
1493e28
Compare
|
Jenkins，retest this please. |
+ cleanup MIN macro + add std namespace Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com> Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
mikulely
force-pushed
the
rgw-cleanup-min
branch
from
1493e28
to
84d0687
Compare
|
@cbodley done. |
cbodley
approved these changes
Oct 17, 2017
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.
No description provided.