diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2012-05-01 10:05:00 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-05-01 10:05:00 -0700 |
commit | e19ccfa657094590d52741066ea161855975ace3 (patch) | |
tree | 5bdb0cd001ccf0420abcd51ebed17c5359b2e5de | |
parent | 6d25b0e99a54b73498c925dd8843de3cb5bbdc69 (diff) | |
parent | 3ee5f8aac3541604c94594b2f4b9cc7d4453a51b (diff) |
Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestring
remove duplicate definition of SecureString in util.h
-rw-r--r-- | src/util.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/util.h b/src/util.h index 6c3e6c5450..5f8d0375da 100644 --- a/src/util.h +++ b/src/util.h @@ -302,14 +302,6 @@ typedef boost::interprocess::interprocess_condition CConditionVariable; } -// 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; - - - - - inline std::string i64tostr(int64 n) { return strprintf("%"PRI64d, n); |