diff options
| author | Anthony Towns <aj@erisian.com.au> | 2018-04-04 18:01:00 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2018-04-11 18:13:54 +1000 |
| commit | 3673ca36ef84192b42d7e6acbdc8b5d2ffc7a0cf (patch) | |
| tree | 85092a34b09d3860593ad961620e709e31dcbb59 /src/util.h | |
| parent | 0a8054e7cd5c76d01e4ac7234e3883d05f6f5fdd (diff) | |
ArgsManager: keep command line and config file arguments separate
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util.h b/src/util.h index 3952461e48..01ff5992fb 100644 --- a/src/util.h +++ b/src/util.h @@ -223,11 +223,12 @@ inline bool IsSwitchChar(char c) class ArgsManager { protected: + friend class ArgsManagerHelper; + mutable CCriticalSection cs_args; - std::map<std::string, std::string> mapArgs; - std::map<std::string, std::vector<std::string>> mapMultiArgs; + 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: |