Un-deprecate removeMember overloads, return void #693
Merged
Conversation
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
Sometimes we just want to remove something we don't need anymore. Having to supply a return buffer for the removeMember function to return something we don't care about is a nuisance. There are removeMember overloads that don't need a return buffer but they are deprecated. This commit un-deprecates these overloads and modifies them to return nothing (void) instead of the object that was removed. Further discussion: #689 WARNING: Changes the return type of the formerly deprecated removeMember overloads from Value to void. May break existing client code.
cdunn2001
reviewed
Oct 16, 2017
src/lib_json/json_value.cpp
Outdated
| } | ||
| Value Value::removeMember(const JSONCPP_STRING& key) | ||
| void Value::removeMember(const JSONCPP_STRING& key) | ||
| { | ||
| return removeMember(key.c_str()); |
There was a problem hiding this comment.
I think we need to drop the return here.
There was a problem hiding this comment.
Returning void from a void function works fine, it's just a matter of style. I left the return in to reduce the number of changed lines. Will submit a new commit but don't think that's the reason for the errors we got from the CI builds.
../src/lib_json/json_value.cpp:1205:26: error: return-statement with a value, in function returning 'void' [-fpermissive]
return nullSingleton();
^
../src/lib_json/json_value.cpp:1209:10: error: return-statement with a value, in function returning 'void' [-fpermissive]
return removed; // still null if removeMember() did nothing
^ |
Don't explicitly return a void value from a void function. Also, convert size_t to unsigned in the CZString ctor to avoid a compiler warning.
orivej
added a commit
to orivej/jsoncpp
that referenced
this pull request
Nov 26, 2018
hjmjohnson
pushed a commit
that referenced
this pull request
Dec 31, 2018
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.
Sometimes we just want to remove something we don't need anymore. Having
to supply a return buffer for the removeMember function to return something
we don't care about is a nuisance. There are removeMember overloads that
don't need a return buffer but they are deprecated. This commit un-deprecates
these overloads and modifies them to return nothing (void) instead of the
object that was removed.
Further discussion: #689
WARNING: Changes the return type of the formerly deprecated removeMember
overloads from Value to void. May break existing client code.