Merge pull request #2010 from Diapolo/bind_unsigned

make enum and parameter used in Bind() unsigned
This commit is contained in:
Pieter Wuille 2012-11-15 15:37:00 -08:00
commit bb76267cc4

View file

@ -29,8 +29,8 @@ CClientUIInterface uiInterface;
// Used to pass flags to the Bind() function // Used to pass flags to the Bind() function
enum BindFlags { enum BindFlags {
BF_NONE = 0, BF_NONE = 0,
BF_EXPLICIT = 1, BF_EXPLICIT = (1U << 0),
BF_REPORT_ERROR = 2 BF_REPORT_ERROR = (1U << 1)
}; };
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -220,7 +220,7 @@ bool static InitWarning(const std::string &str)
} }
bool static Bind(const CService &addr, int flags) { bool static Bind(const CService &addr, unsigned int flags) {
if (!(flags & BF_EXPLICIT) && IsLimited(addr)) if (!(flags & BF_EXPLICIT) && IsLimited(addr))
return false; return false;
std::string strError; std::string strError;