aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/base')
-rw-r--r--src/lib/base/secmem.h33
1 files changed, 5 insertions, 28 deletions
diff --git a/src/lib/base/secmem.h b/src/lib/base/secmem.h
index 92477438d..68dd4c678 100644
--- a/src/lib/base/secmem.h
+++ b/src/lib/base/secmem.h
@@ -35,36 +35,13 @@ class secure_allocator
typedef T value_type;
typedef std::size_t size_type;
-#ifdef BOTAN_BUILD_COMPILER_IS_MSVC_2013
- secure_allocator() = default;
- secure_allocator(const secure_allocator&) = default;
- secure_allocator& operator=(const secure_allocator&) = default;
- ~secure_allocator() = default;
-
- template <typename U>
- struct rebind
- {
- typedef secure_allocator<U> other;
- };
-
- void construct(value_type* mem, const value_type& value)
- {
- std::_Construct(mem, value);
- }
-
- void destroy(value_type* mem)
- {
- std::_Destroy(mem);
- }
-#else
- secure_allocator() BOTAN_NOEXCEPT = default;
- secure_allocator(const secure_allocator&) BOTAN_NOEXCEPT = default;
- secure_allocator& operator=(const secure_allocator&) BOTAN_NOEXCEPT = default;
- ~secure_allocator() BOTAN_NOEXCEPT = default;
-#endif
+ secure_allocator() noexcept = default;
+ secure_allocator(const secure_allocator&) noexcept = default;
+ secure_allocator& operator=(const secure_allocator&) noexcept = default;
+ ~secure_allocator() noexcept = default;
template<typename U>
- secure_allocator(const secure_allocator<U>&) BOTAN_NOEXCEPT {}
+ secure_allocator(const secure_allocator<U>&) noexcept {}
T* allocate(std::size_t n)
{