aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorrcdailey <[email protected]>2015-03-08 16:48:23 +0000
committerlloyd <[email protected]>2015-03-08 16:48:23 +0000
commitc84b150c50093c680f18f0792bf7d52f157b01fe (patch)
tree40158cb3da0f1064d0ab6b42ae2ab998f604b168 /src/lib
parentf0ccd62149e466d4fbf1fb2c57227c4d3cee190c (diff)
Add BOTAN_NOEXCEPT macro to work around missing noexcept in VS 2013.
Based on github pull req 23 by Robert Daily.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/alloc/secmem.h10
-rw-r--r--src/lib/utils/exceptn.h2
2 files changed, 6 insertions, 6 deletions
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<size_type>(-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"; }
};