diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-23 10:09:13 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2011-12-23 10:09:13 -0500 |
| commit | 961cf14ab3e0d16bcecdb64717accd088a0d00aa (patch) | |
| tree | 6c9181d3cda8398d424e4fd0507d225cc0e3a979 /src/util.h | |
| parent | 96c700f5e4b283e5479505d1e5f8fc9884dc1ff5 (diff) | |
| parent | 863238316144b0ae8d0208ed60d86d932475cfaa (diff) | |
| download | bitcoin-961cf14ab3e0d16bcecdb64717accd088a0d00aa.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/util.h b/src/util.h index 1ef0e6f15c..dcf060e3e8 100644 --- a/src/util.h +++ b/src/util.h @@ -296,6 +296,10 @@ public: // (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; + |