diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-17 09:39:54 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-17 09:39:54 -0500 |
commit | fdb365df0e9bf1b3073ea38212664cb59863bbd0 (patch) | |
tree | 8295f7921c90f40e561d1931eba0e4377d5055ea /src/util.h | |
parent | 0365f19dececa3bd84ae28ec4aabb955ffb8b405 (diff) | |
parent | 8960f2fc3353d5d7f8b9babd1aaef0e9869e39f4 (diff) | |
download | bitcoin-fdb365df0e9bf1b3073ea38212664cb59863bbd0.tar.xz |
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/util.h')
-rw-r--r-- | src/util.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/util.h b/src/util.h index e78fd134cf..19a291209a 100644 --- a/src/util.h +++ b/src/util.h @@ -257,6 +257,12 @@ public: for (bool fcriticalblockonce=true; fcriticalblockonce; assert(("break caught by CRITICAL_BLOCK!" && !fcriticalblockonce)), fcriticalblockonce=false) \ for (CCriticalBlock criticalblock(cs, #cs, __FILE__, __LINE__); fcriticalblockonce; fcriticalblockonce=false) +#define ENTER_CRITICAL_SECTION(cs) \ + (cs).Enter(#cs, __FILE__, __LINE__) + +#define LEAVE_CRITICAL_SECTION(cs) \ + (cs).Leave() + class CTryCriticalBlock { protected: |