feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Botan: Fix compilation with MSVC2013

Browse Source 
noexcept is not supported.

Change-Id: Iee6f80a3e99191ccc92637aea42c5043d4f2d212
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-05-11 08:27:05 +03:00
committed by Orgad Shaneh
parent ea520e3f97
commit b57a35ab55
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/3rdparty/botan/botan.cpp vendored
View File

@@ -379,7 +379,7 @@ class Mutex
* Unlock the mutex * Unlock the mutex
*/ */
virtual void unlock() = 0; 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"); 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 * We can safely close here, because post-mmap the file

2
src/libs/3rdparty/botan/botan.h vendored
View File

@@ -390,7 +390,7 @@ class BOTAN_DLL Allocator
*/ */
virtual void destroy() {} virtual void destroy() {}
virtual ~Allocator() noexcept(false) {} virtual ~Allocator() Q_DECL_NOEXCEPT_EXPR(false) {}
}; };
} }