From b57a35ab556c52171a99d289bed8c5b13b385feb Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 11 May 2016 08:27:05 +0300 Subject: Botan: Fix compilation with MSVC2013 noexcept is not supported. Change-Id: Iee6f80a3e99191ccc92637aea42c5043d4f2d212 Reviewed-by: Christian Kandeler --- src/libs/3rdparty/botan/botan.cpp | 4 ++-- src/libs/3rdparty/botan/botan.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libs/3rdparty') diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp index 88347697397..f5776009038 100644 --- a/src/libs/3rdparty/botan/botan.cpp +++ b/src/libs/3rdparty/botan/botan.cpp @@ -379,7 +379,7 @@ class Mutex * Unlock the mutex */ virtual void unlock() = 0; - virtual ~Mutex() noexcept(false) {} + virtual ~Mutex() Q_DECL_NOEXCEPT_EXPR(false) {} }; /** @@ -3296,7 +3296,7 @@ void* MemoryMapping_Allocator::alloc_block(size_t n) throw MemoryMapping_Failed("Could not unlink temporary file"); } - ~TemporaryFile() noexcept(false) + ~TemporaryFile() Q_DECL_NOEXCEPT_EXPR(false) { /* * We can safely close here, because post-mmap the file diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h index 9a51b80d13a..4f36816f991 100644 --- a/src/libs/3rdparty/botan/botan.h +++ b/src/libs/3rdparty/botan/botan.h @@ -390,7 +390,7 @@ class BOTAN_DLL Allocator */ virtual void destroy() {} - virtual ~Allocator() noexcept(false) {} + virtual ~Allocator() Q_DECL_NOEXCEPT_EXPR(false) {} }; } -- cgit v1.2.3