From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 23 Dec 2011 15:09:13 +0000 (-0500)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~37
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=961cf14ab3e0d16bcecdb64717accd088a0d00aa

Merge branch '0.5.0.x' into 0.5.x
---

961cf14ab3e0d16bcecdb64717accd088a0d00aa
diff --cc src/util.h
index 1ef0e6f,bcb9027..dcf060e
--- a/src/util.h
+++ b/src/util.h
@@@ -292,10 -285,11 +292,14 @@@ public
  
  
  
 +// 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;
+