diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-06-13 13:48:57 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-06-13 13:49:18 -0400 |
| commit | 4a7e64fc85461a205f2b51da52d1455795d43b91 (patch) | |
| tree | 644d738dfc4f8e6cb035a231946851528bc8f601 /src/util.h | |
| parent | b2221381e787b7be13e737d611ce01b9a863ee2e (diff) | |
| parent | c2dfbb4a97513557fe923b7810ea8639c320fefd (diff) | |
| download | bitcoin-4a7e64fc85461a205f2b51da52d1455795d43b91.tar.xz | |
Merge #13441: Prevent shared conf files from failing with different available options in different binaries
c2dfbb4a97 Add unavailable options to hidden options category (Andrew Chow)
Pull request description:
From IRC:
```
<ossifrage> FYI, bitcoin-qt from the head I built today won't start if you have "daemon=0" in the config file, so you can't use the same config for either bitcoind or bitcoin-qt
<ossifrage> Seems like bitcoin-qt should ignore this option?
<provoostenator> ossifrage: probably caused by 13112. Another problem is disablewallet=1 will prevent a launch if you compile bitcoind without wallet. It probably needs to be relaxed slightly.
```
Adds all of the options that are unavailable due to compiling options to the hidden category so that shared config files do not break with the alternative binaries.
Tree-SHA512: 1ef43f5f7ad46ecc2865d22ee683ef22831e8f131ec99b732bb36d90381f7964bf64829595e993c2d435823fe4425a20323c8e65307cf2463a9e40b8049ab559
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/util.h b/src/util.h index efd8a4bd9d..8094d72d6b 100644 --- a/src/util.h +++ b/src/util.h @@ -264,6 +264,11 @@ public: void AddArg(const std::string& name, const std::string& help, const bool debug_only, const OptionsCategory& cat); /** + * Add many hidden arguments + */ + void AddHiddenArgs(const std::vector<std::string>& args); + + /** * Clear available arguments */ void ClearArgs() { m_available_args.clear(); } |