diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-19 12:38:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-19 12:40:01 +0100 |
| commit | 7f72568e6b15fc139323fb200591a50762f6df0b (patch) | |
| tree | 85a19f00ca5bd8c88874d3f162d5ca84ac2c95d9 /src/util.cpp | |
| parent | a336d13a587c46470fd6671d558198f299f04a8d (diff) | |
| parent | 749be013f5cba0bbb01f1f89df77106aea5a4cc1 (diff) | |
| download | bitcoin-7f72568e6b15fc139323fb200591a50762f6df0b.tar.xz | |
Merge #9236: Fix races for strMiscWarning and fLargeWork*Found, make QT runawayException use GetWarnings
749be01 Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp index 60701e7949..977f8993ed 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -107,7 +107,7 @@ map<string, vector<string> > mapMultiArgs; bool fDebug = false; bool fPrintToConsole = false; bool fPrintToDebugLog = true; -string strMiscWarning; + bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS; bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS; bool fLogIPs = DEFAULT_LOGIPS; |