X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.h;h=a04ab2c948bdc96f20c611421c9dec791742a506;hb=f342dac1cb06d5b0d264fa59e448ef6477ec5b6b;hp=7027e62b09b53c279bc2135074b765f14cb05970;hpb=908037fe16843aa354f63af8f14804821aaf70f1;p=novacoin.git diff --git a/src/util.h b/src/util.h index 7027e62..a04ab2c 100644 --- a/src/util.h +++ b/src/util.h @@ -190,10 +190,10 @@ typedef boost::interprocess::interprocess_recursive_mutex CCriticalSection; typedef boost::interprocess::interprocess_mutex CWaitableCriticalSection; #ifdef DEBUG_LOCKORDER -void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs); +void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false); void LeaveCritical(); #else -void static inline EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs) {} +void static inline EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false) {} void static inline LeaveCritical() {} #endif @@ -234,7 +234,7 @@ public: { if (!lock.owns()) { - EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex())); + EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex()), true); lock.try_lock(); if (!lock.owns()) LeaveCritical();