diff options
author | Anthony Towns <aj@erisian.com.au> | 2018-04-04 18:02:00 +1000 |
---|---|---|
committer | Anthony Towns <aj@erisian.com.au> | 2018-04-11 23:15:28 +1000 |
commit | 4d34fcc7138f0ffc831f0f8601c50cc7f494c197 (patch) | |
tree | 2d164195b5bfb5128be26ee4b8e18ef5acfe3274 /src/util.h | |
parent | 3673ca36ef84192b42d7e6acbdc8b5d2ffc7a0cf (diff) | |
download | bitcoin-4d34fcc7138f0ffc831f0f8601c50cc7f494c197.tar.xz |
ArgsManager: drop m_negated_args
When a -nofoo option is seen, instead of adding it to a separate
set of negated args, set the arg as being an empty vector of strings.
This changes the behaviour in some ways:
- -nofoo=0 still sets foo=1 but no longer treats it as a negated arg
- -nofoo=1 -foo=2 has GetArgs() return [2] rather than [2,0]
- "foo=2 \n -nofoo=1" in a config file no longer returns [2,0], just [0]
- GetArgs returns an empty vector for negated args
Diffstat (limited to 'src/util.h')
-rw-r--r-- | src/util.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/util.h b/src/util.h index 01ff5992fb..6b80afc58f 100644 --- a/src/util.h +++ b/src/util.h @@ -228,7 +228,6 @@ protected: mutable CCriticalSection cs_args; std::map<std::string, std::vector<std::string>> m_override_args; std::map<std::string, std::vector<std::string>> m_config_args; - std::unordered_set<std::string> m_negated_args; void ReadConfigStream(std::istream& stream); public: @@ -314,11 +313,6 @@ public: * @return CBaseChainParams::MAIN by default; raises runtime error if an invalid combination is given. */ std::string GetChainName() const; - -private: - - // Munge -nofoo into -foo=0 and track the value as negated. - void InterpretNegatedOption(std::string &key, std::string &val); }; extern ArgsManager gArgs; |