diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-16 04:43:49 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-16 04:47:55 +0200 |
| commit | dc54e9db982118ec71cc11b8d027e5a569810cba (patch) | |
| tree | 34b0ca1ab9f4c153a551750dae6fea3b2dbf286a /src/init.cpp | |
| parent | 7388b74cd2c5e3b71e991d26953c89c059ba6f2f (diff) | |
| parent | 8d657a651735426388c5f7462e2dbf24225a26cb (diff) | |
| download | bitcoin-dc54e9db982118ec71cc11b8d027e5a569810cba.tar.xz | |
Merge pull request #4825
8d657a6 Fixing compiler warning C4800: 'type' forcing value to bool 'true' or 'false' (ENikS)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 71e75dac73..67f53e044c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -198,7 +198,7 @@ bool static Bind(const CService &addr, unsigned int flags) { if (!(flags & BF_EXPLICIT) && IsLimited(addr)) return false; std::string strError; - if (!BindListenPort(addr, strError, flags & BF_WHITELIST)) { + if (!BindListenPort(addr, strError, (flags & BF_WHITELIST) != 0)) { if (flags & BF_REPORT_ERROR) return InitError(strError); return false; @@ -694,7 +694,7 @@ bool AppInit2(boost::thread_group& threadGroup) std::string strWalletFile = GetArg("-wallet", "wallet.dat"); #endif // ENABLE_WALLET - fIsBareMultisigStd = GetArg("-permitbaremultisig", true); + fIsBareMultisigStd = GetArg("-permitbaremultisig", true) != 0; // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log // Sanity check |