diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2021-08-18 21:08:08 -0400 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2021-10-25 10:44:17 -0400 |
| commit | c5d7e34bd9a4ad752c5ec88032420e2e90ab17ab (patch) | |
| tree | 15ef772af6bf9ce313970f1506d31c8a90fa80c7 /src/util/system.cpp | |
| parent | b8c069b7a952e326d2d974cc671889d1a3b38aa4 (diff) | |
| download | bitcoin-c5d7e34bd9a4ad752c5ec88032420e2e90ab17ab.tar.xz | |
scripted-diff: disable unimplemented ArgsManager BOOL/INT/STRING flags
This commit does not change behavior in any way. See previous commit for
complete rationale, but these flags are being disabled because they
aren't implemented and will otherwise break backwards compatibility when
they are implemented.
-BEGIN VERIFY SCRIPT-
sed -i 's:\(ALLOW_.*\) \(//!< unimplemented\):// \1\2:' src/util/system.h
sed -i '/DISALLOW_NEGATION.*scripted-diff/d' src/util/system.cpp
git grep -l 'ArgsManager::ALLOW_\(INT\|STRING\)' | xargs sed -i 's/ArgsManager::ALLOW_\(INT\|STRING\)/ArgsManager::ALLOW_ANY | ArgsManager::DISALLOW_NEGATION/g'
git grep -l 'ALLOW_BOOL' -- ':!src/util/system.h' | xargs sed -i 's/ALLOW_BOOL/ALLOW_ANY/g'
-END VERIFY SCRIPT-
Diffstat (limited to 'src/util/system.cpp')
| -rw-r--r-- | src/util/system.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 47c2cc5af8..99d111b066 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -652,7 +652,6 @@ void ArgsManager::AddArg(const std::string& name, const std::string& help, unsig LOCK(cs_args); std::map<std::string, Arg>& arg_map = m_available_args[cat]; - if ((flags & (ALLOW_ANY | ALLOW_BOOL)) == 0) flags |= DISALLOW_NEGATION; // Temporary, removed in next scripted-diff auto ret = arg_map.emplace(arg_name, Arg{name.substr(eq_index, name.size() - eq_index), help, flags}); assert(ret.second); // Make sure an insertion actually happened |