diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-05-11 08:27:05 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-05-11 09:34:09 +0000 |
| commit | b57a35ab556c52171a99d289bed8c5b13b385feb (patch) | |
| tree | 3c63dda2a5106deb5a0b0710a2089d9ffff76b74 /src/libs/3rdparty | |
| parent | ea520e3f976eb05e29ac4f3394a101c3c57902f3 (diff) | |
Botan: Fix compilation with MSVC2013
noexcept is not supported.
Change-Id: Iee6f80a3e99191ccc92637aea42c5043d4f2d212
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/libs/3rdparty')
| -rw-r--r-- | src/libs/3rdparty/botan/botan.cpp | 4 | ||||
| -rw-r--r-- | src/libs/3rdparty/botan/botan.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp index 8834769739..f577600903 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 9a51b80d13..4f36816f99 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) {} }; } |