diff options
| author | Jack Lloyd <[email protected]> | 2017-09-27 06:18:53 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-27 06:19:20 -0400 |
| commit | da1984cf643e522028cad032e786b49cabdc5355 (patch) | |
| tree | 3a6d013e6c558c33a66c57726e56edaee3c7a06e /src/lib/base | |
| parent | 134ef6a59593dac565d4070a1b344fdc468b3e6e (diff) | |
Move the SecureVector typedef to secmem.h
No point making someone include a deprecated header to get this.
Diffstat (limited to 'src/lib/base')
| -rw-r--r-- | src/lib/base/botan.h | 12 | ||||
| -rw-r--r-- | src/lib/base/secmem.h | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/base/botan.h b/src/lib/base/botan.h index e3886a6c7..ddea0d4ad 100644 --- a/src/lib/base/botan.h +++ b/src/lib/base/botan.h @@ -42,16 +42,4 @@ #include <botan/pkcs8.h> #endif -/* -* The reason the name changed is because the types are not -* completely compatible. But allow it as a standin -*/ - -namespace Botan { - -template<typename T> -using SecureVector = secure_vector<T>; - -} - #endif diff --git a/src/lib/base/secmem.h b/src/lib/base/secmem.h index 5b77ed925..9ae4431f5 100644 --- a/src/lib/base/secmem.h +++ b/src/lib/base/secmem.h @@ -122,6 +122,9 @@ operator!=(const secure_allocator<T>&, const secure_allocator<U>&) template<typename T> using secure_vector = std::vector<T, secure_allocator<T>>; template<typename T> using secure_deque = std::deque<T, secure_allocator<T>>; +// For better compatability with 1.10 API +template<typename T> using SecureVector = secure_vector<T>; + template<typename T> std::vector<T> unlock(const secure_vector<T>& in) { |