Merge branch '0.5.0.x' into 0.5.x

diff --combined src/util.h
index 1ef0e6f,bcb9027..dcf060e
--- 1/src/util.h
--- 2/src/util.h
+++ b/src/util.h
@@@ -243,20 -243,19 +243,20 @@@ public
          pcs = &csIn;
          pcs->Enter(pszName, pszFile, nLine);
      }
 +
 +    operator bool() const
 +    {
 +        return true;
 +    }
 +
      ~CCriticalBlock()
      {
          pcs->Leave();
      }
  };
  
 -// WARNING: This will catch continue and break!
 -// break is caught with an assertion, but there's no way to detect continue.
 -// I'd rather be careful than suffer the other more error prone syntax.
 -// The compiler will optimise away all this loop junk.
  #define CRITICAL_BLOCK(cs)     \
 -    for (bool fcriticalblockonce=true; fcriticalblockonce; assert(("break caught by CRITICAL_BLOCK!" && !fcriticalblockonce)), fcriticalblockonce=false) \
 -        for (CCriticalBlock criticalblock(cs, #cs, __FILE__, __LINE__); fcriticalblockonce; fcriticalblockonce=false)
 +    if (CCriticalBlock criticalblock = CCriticalBlock(cs, #cs, __FILE__, __LINE__))
  
  class CTryCriticalBlock
  {
@@@ -268,12 -267,6 +268,12 @@@ public
      {
          pcs = (csIn.TryEnter(pszName, pszFile, nLine) ? &csIn : NULL);
      }
 +
 +    operator bool() const
 +    {
 +        return Entered();
 +    }
 +
      ~CTryCriticalBlock()
      {
          if (pcs)
@@@ -281,21 -274,22 +281,25 @@@
              pcs->Leave();
          }
      }
 -    bool Entered() { return pcs != NULL; }
 +    bool Entered() const { return pcs != NULL; }
  };
  
  #define TRY_CRITICAL_BLOCK(cs)     \
 -    for (bool fcriticalblockonce=true; fcriticalblockonce; assert(("break caught by TRY_CRITICAL_BLOCK!" && !fcriticalblockonce)), fcriticalblockonce=false) \
 -        for (CTryCriticalBlock criticalblock(cs, #cs, __FILE__, __LINE__); fcriticalblockonce && (fcriticalblockonce = criticalblock.Entered()); fcriticalblockonce=false)
 +    if (CTryCriticalBlock criticalblock = CTryCriticalBlock(cs, #cs, __FILE__, __LINE__))
 +
  
  
  
  
  
 +// This is exactly like std::string, but with a custom allocator.
 +// (secure_allocator<> is defined in serialize.h)
 +typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
  
+ // This is exactly like std::string, but with a custom allocator.
+ // (secure_allocator<> is defined in serialize.h)
+ typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
+