Gentoo Archives: gentoo-commits

From: Alon Bar-Lev <alonbl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
Date: Thu, 12 Oct 2017 16:46:06
Message-Id: 1507826753.e45fa6d5a1e0b9335ee826e8cc7db851c3affa6d.alonbl@gentoo
1 commit: e45fa6d5a1e0b9335ee826e8cc7db851c3affa6d
2 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 12 16:45:53 2017 +0000
4 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 12 16:45:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45fa6d5
7
8 dev-libs/botan: cleanup
9
10 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621120
11 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=632104
12 Package-Manager: Portage-2.3.8, Repoman-2.3.3
13
14 dev-libs/botan/files/botan-1.10.15-c++11.patch | 36 --------------------------
15 1 file changed, 36 deletions(-)
16
17 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
18 deleted file mode 100644
19 index e47b56600fe..00000000000
20 --- a/dev-libs/botan/files/botan-1.10.15-c++11.patch
21 +++ /dev/null
22 @@ -1,36 +0,0 @@
23 -From dc2834f708a6d857b1a7f9587d5a28af271103e5 Mon Sep 17 00:00:00 2001
24 -From: Peter-Levine <plevine457@×××××.com>
25 -Date: Mon, 20 Mar 2017 22:13:21 -0400
26 -Subject: [PATCH] Allow destructor to throw when building with >=C++11
27 -
28 -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)`.
29 ----
30 - src/alloc/alloc_mmap/mmap_mem.cpp | 8 +++++++-
31 - 1 file changed, 7 insertions(+), 1 deletion(-)
32 -
33 -diff --git a/src/alloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp
34 -index 17c189e..2637533 100644
35 ---- a/src/alloc/alloc_mmap/mmap_mem.cpp
36 -+++ b/src/alloc/alloc_mmap/mmap_mem.cpp
37 -@@ -21,6 +21,12 @@
38 - #define MAP_FAILED -1
39 - #endif
40 -
41 -+#if __cplusplus >= 201103L
42 -+#define NOEXCEPT noexcept(false)
43 -+#else
44 -+#define NOEXCEPT
45 -+#endif
46 -+
47 - namespace Botan {
48 -
49 - namespace {
50 -@@ -66,7 +72,7 @@ void* MemoryMapping_Allocator::alloc_block(size_t n)
51 - throw MemoryMapping_Failed("Could not unlink temporary file");
52 - }
53 -
54 -- ~TemporaryFile()
55 -+ ~TemporaryFile() NOEXCEPT
56 - {
57 - /*
58 - * We can safely close here, because post-mmap the file