From 3673ca36ef84192b42d7e6acbdc8b5d2ffc7a0cf Mon Sep 17 00:00:00 2001
From: Anthony Towns <aj@erisian.com.au>
Date: Wed, 4 Apr 2018 18:01:00 +1000
Subject: ArgsManager: keep command line and config file arguments separate

---
 src/util.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/util.h')

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:
-- 
cgit v1.2.3