From c84b150c50093c680f18f0792bf7d52f157b01fe Mon Sep 17 00:00:00 2001 From: rcdailey Date: Sun, 8 Mar 2015 16:48:23 +0000 Subject: Add BOTAN_NOEXCEPT macro to work around missing noexcept in VS 2013. Based on github pull req 23 by Robert Daily. --- src/lib/alloc/secmem.h | 10 +++++----- src/lib/utils/exceptn.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/alloc/secmem.h b/src/lib/alloc/secmem.h index 82b4083ea..6b3f8a487 100644 --- a/src/lib/alloc/secmem.h +++ b/src/lib/alloc/secmem.h @@ -34,14 +34,14 @@ class secure_allocator typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - secure_allocator() noexcept {} + secure_allocator() BOTAN_NOEXCEPT {} - ~secure_allocator() noexcept {} + ~secure_allocator() BOTAN_NOEXCEPT {} - pointer address(reference x) const noexcept + pointer address(reference x) const BOTAN_NOEXCEPT { return std::addressof(x); } - const_pointer address(const_reference x) const noexcept + const_pointer address(const_reference x) const BOTAN_NOEXCEPT { return std::addressof(x); } pointer allocate(size_type n, const void* = 0) @@ -68,7 +68,7 @@ class secure_allocator delete [] p; } - size_type max_size() const noexcept + size_type max_size() const BOTAN_NOEXCEPT { return static_cast(-1) / sizeof(T); } diff --git a/src/lib/utils/exceptn.h b/src/lib/utils/exceptn.h index e7231f84d..7a10319c5 100644 --- a/src/lib/utils/exceptn.h +++ b/src/lib/utils/exceptn.h @@ -172,7 +172,7 @@ struct BOTAN_DLL Self_Test_Failure : public Internal_Error */ struct BOTAN_DLL Memory_Exhaustion : public std::bad_alloc { - const char* what() const noexcept + const char* what() const BOTAN_NOEXCEPT { return "Ran out of memory, allocation failed"; } }; -- cgit v1.2.3