New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Renamed UniValue::__pushKV to UniValue::pushKVEnd. #27822
Conversation
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
See https://github.com/bitcoin/bitcoin/blob/master/doc/developer-notes.md#scripted-diffs for changes like this. |
lgtm ACK acad989 |
Does it make sense to force such changes with the Clang's |
@Brotcrunsher are you going to rebase this? |
I get a warning about diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h
index a0918bf463..b2076bea07 100644
--- a/src/support/allocators/secure.h
+++ b/src/support/allocators/secure.h
@@ -32,9 +32,9 @@ struct secure_allocator : public std::allocator<T> {
{
}
~secure_allocator() noexcept {}
- template <typename _Other>
+ template <typename Other>
struct rebind {
- typedef secure_allocator<_Other> other;
+ typedef secure_allocator<Other> other;
};
T* allocate(std::size_t n, const void* hint = nullptr)
diff --git a/src/support/allocators/zeroafterfree.h b/src/support/allocators/zeroafterfree.h
index 795eea3bc0..2dc644c242 100644
--- a/src/support/allocators/zeroafterfree.h
+++ b/src/support/allocators/zeroafterfree.h
@@ -27,9 +27,9 @@ struct zero_after_free_allocator : public std::allocator<T> {
{
}
~zero_after_free_allocator() noexcept {}
- template <typename _Other>
+ template <typename Other>
struct rebind {
- typedef zero_after_free_allocator<_Other> other;
+ typedef zero_after_free_allocator<Other> other;
};
void deallocate(T* p, std::size_t n) |
I got the same. Could be added to this PR, no? |
c014cbb
to
98fde4d
Compare
Please follow the commit subject max len, according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#committing-patches |
Any identifier starting with two _, or one _ followed by a capital letter is reserved for the compiler and thus must not be used. See: https://stackoverflow.com/a/228797/7130273 -BEGIN VERIFY SCRIPT- s() { git grep -l "$1" src | xargs sed -i "s/$1/$2/g"; } s '__pushKV' 'pushKVEnd' s '_EraseTx' 'EraseTxNoLock' s '_Other' 'Other' -END VERIFY SCRIPT-
Thanks for the feedback, done! One detail question regarding the max length (not important for this Commit, just want to learn for the future). Are CI triggers like "scripted-diff: " considered as part of the subject line and thus part of the 80 chars limitation? |
lgtm ACK bdea2bb |
Doing so is going to require further suppressing, or changes in upstream code. i.e: ./minisketch/include/minisketch.h:2:9: warning: macro name is a reserved identifier [-Wreserved-macro-identifier]
#define _MINISKETCH_H_ 1
^
1 warning generated.
./crypto/ctaes/ctaes.h:8:9: warning: macro name is a reserved identifier [-Wreserved-macro-identifier]
#define _CTAES_H_ 1
^
1 warning generated.
./leveldb/port/thread_annotations.h:16:9: warning: macro name is a reserved identifier [-Wreserved-macro-identifier]
#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
^
1 warning generated.
minisketch/src/util.h:16:11: warning: macro name is a reserved identifier [-Wreserved-macro-identifier]
# define __GNUC_PREREQ(_maj,_min) \
^
3 warnings generated. |
bdea2bb scripted-diff: Following the C++ Standard rules for identifiers with _. (Brotcrunsher) Pull request description: Any identifier starting with 2 _ is reserved for the compiler and thus must not be used. See: https://stackoverflow.com/a/228797/7130273 ACKs for top commit: MarcoFalke: lgtm ACK bdea2bb Tree-SHA512: 74c8e676449f3f61476d846bfd2c514103c8914e13c4a0db841203abdc0267c25ddc6ed57d6791459efe3edea17753a1b53c3795071ddfe8aba8662521063407
'__pushKV' -> 'pushKVEnd' see btc PR bitcoin#27822
Any identifier starting with 2 _ is reserved for the compiler and thus must not be used.
See: https://stackoverflow.com/a/228797/7130273