diff options
| author | practicalswift <[email protected]> | 2017-07-18 15:11:18 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2017-07-18 15:54:38 +0200 |
| commit | e0d459264fa9330eea99d33208fbddb8c8362be4 (patch) | |
| tree | 5a8bc23b4ef11691f0421485466d670650bbeb8b | |
| parent | Merge #10795: No longer ever reuse keypool indexes (diff) | |
| download | discoin-e0d459264fa9330eea99d33208fbddb8c8362be4.tar.xz discoin-e0d459264fa9330eea99d33208fbddb8c8362be4.zip | |
Avoid redundant redeclaration of GetWarnings(const string&)
std::string GetWarnings(const std::string& strFor) is declared in
warnings.h and defined in warnings.cpp.
| -rw-r--r-- | src/qt/clientmodel.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/mining.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/misc.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/net.cpp | 2 | ||||
| -rw-r--r-- | src/validation.h | 8 | ||||
| -rw-r--r-- | src/warnings.h | 7 |
6 files changed, 11 insertions, 9 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 33f4535ee..52ce11cef 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -18,6 +18,7 @@ #include "txmempool.h" #include "ui_interface.h" #include "util.h" +#include "warnings.h" #include <stdint.h> diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 4fd632dfc..daca32d25 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -24,6 +24,7 @@ #include "util.h" #include "utilstrencodings.h" #include "validationinterface.h" +#include "warnings.h" #include <memory> #include <stdint.h> diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index fcbbe1cee..3c4f071fc 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -21,6 +21,7 @@ #include "wallet/wallet.h" #include "wallet/walletdb.h" #endif +#include "warnings.h" #include <stdint.h> #ifdef HAVE_MALLOC_INFO diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index ed452fcb0..090d9e448 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -18,7 +18,7 @@ #include "util.h" #include "utilstrencodings.h" #include "version.h" - +#include "warnings.h" #include <univalue.h> diff --git a/src/validation.h b/src/validation.h index a9f995abb..95c8e5b93 100644 --- a/src/validation.h +++ b/src/validation.h @@ -268,14 +268,6 @@ void UnloadBlockIndex(); void ThreadScriptCheck(); /** Check whether we are doing an initial block download (synchronizing from disk or network) */ bool IsInitialBlockDownload(); -/** Format a string that describes several potential problems detected by the core. - * strFor can have three values: - * - "rpc": get critical warnings, which should put the client in safe mode if non-empty - * - "statusbar": get all warnings - * - "gui": get all warnings, translated (where possible) for GUI - * This function only returns the highest priority warning of the set selected by strFor. - */ -std::string GetWarnings(const std::string& strFor); /** Retrieve a transaction (from memory pool, or from disk, if possible) */ bool GetTransaction(const uint256 &hash, CTransactionRef &tx, const Consensus::Params& params, uint256 &hashBlock, bool fAllowSlow = false); /** Find the best known block, and make it the tip of the block chain */ diff --git a/src/warnings.h b/src/warnings.h index a7aa65742..fd0ca5394 100644 --- a/src/warnings.h +++ b/src/warnings.h @@ -14,6 +14,13 @@ void SetfLargeWorkForkFound(bool flag); bool GetfLargeWorkForkFound(); void SetfLargeWorkInvalidChainFound(bool flag); bool GetfLargeWorkInvalidChainFound(); +/** Format a string that describes several potential problems detected by the core. + * strFor can have three values: + * - "rpc": get critical warnings, which should put the client in safe mode if non-empty + * - "statusbar": get all warnings + * - "gui": get all warnings, translated (where possible) for GUI + * This function only returns the highest priority warning of the set selected by strFor. + */ std::string GetWarnings(const std::string& strFor); static const bool DEFAULT_TESTSAFEMODE = false; |