Merge branch '0.4.x' into 0.5.0.x

This commit is contained in:
Luke Dashjr
2012-02-17 09:39:54 -05:00
3 changed files with 23 additions and 19 deletions
+6
View File
@@ -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: