summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2017-10-12 19:45:53 +0300
committerAlon Bar-Lev <alonbl@gentoo.org>2017-10-12 19:45:53 +0300
commite45fa6d5a1e0b9335ee826e8cc7db851c3affa6d (patch)
tree3e6b530120923d50db7417f1991060581a6a4902
parentdev-libs/botan: fixup metadata.xml (diff)
downloadgentoo-e45fa6d5a1e0b9335ee826e8cc7db851c3affa6d.tar.gz
gentoo-e45fa6d5a1e0b9335ee826e8cc7db851c3affa6d.tar.bz2
gentoo-e45fa6d5a1e0b9335ee826e8cc7db851c3affa6d.zip
dev-libs/botan: cleanup
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621120 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=632104 Package-Manager: Portage-2.3.8, Repoman-2.3.3
-rw-r--r--dev-libs/botan/files/botan-1.10.15-c++11.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/dev-libs/botan/files/botan-1.10.15-c++11.patch b/dev-libs/botan/files/botan-1.10.15-c++11.patch
deleted file mode 100644
index e47b56600fe1..000000000000
--- a/dev-libs/botan/files/botan-1.10.15-c++11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dc2834f708a6d857b1a7f9587d5a28af271103e5 Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Mon, 20 Mar 2017 22:13:21 -0400
-Subject: [PATCH] Allow destructor to throw when building with >=C++11
-
-After C++11, destructors default to `noexcept(true)`. Thus, any throw statements in destructors become calls to `std::terminate()`. To enable the intended throw statement, the destructor must be explicitly marked `noexcept(false)`.
----
- src/alloc/alloc_mmap/mmap_mem.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/alloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp
-index 17c189e..2637533 100644
---- a/src/alloc/alloc_mmap/mmap_mem.cpp
-+++ b/src/alloc/alloc_mmap/mmap_mem.cpp
-@@ -21,6 +21,12 @@
- #define MAP_FAILED -1
- #endif
-
-+#if __cplusplus >= 201103L
-+#define NOEXCEPT noexcept(false)
-+#else
-+#define NOEXCEPT
-+#endif
-+
- namespace Botan {
-
- namespace {
-@@ -66,7 +72,7 @@ void* MemoryMapping_Allocator::alloc_block(size_t n)
- throw MemoryMapping_Failed("Could not unlink temporary file");
- }
-
-- ~TemporaryFile()
-+ ~TemporaryFile() NOEXCEPT
- {
- /*
- * We can safely close here, because post-mmap the file