forked from cms-sw/cmsdist
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0001-Revert-r248245-breaks-ROOT.patch
68 lines (62 loc) · 2.48 KB
/
0001-Revert-r248245-breaks-ROOT.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
From b229129c3a495965695f514ac85e449818b17990 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <[email protected]>
Date: Wed, 24 May 2017 19:12:27 +0200
Subject: [PATCH] Revert r248245 (breaks ROOT)
Git commit: 7d2124f7e0a0cff7cfdddedf7c1c89d396ca1423
SVN commit: r248245
Signed-off-by: David Abdurachmanov <[email protected]>
---
libstdc++-v3/include/std/functional | 6 ----
.../20_util/function_objects/mem_fn/80478.cc | 27 --------------------
2 files changed, 0 insertions(+), 33 deletions(-)
delete mode 100644 libstdc++-v3/testsuite/20_util/function_objects/mem_fn/80478.cc
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index 465b3ec..e4a82ee 100644
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -135,12 +135,6 @@ _GLIBCXX_MEM_FN_TRAITS( , true_type, true_type)
_GLIBCXX_MEM_FN_TRAITS(&, true_type, false_type)
_GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
-#if __cplusplus > 201402L
-_GLIBCXX_MEM_FN_TRAITS(noexcept, true_type, true_type)
-_GLIBCXX_MEM_FN_TRAITS(& noexcept, true_type, false_type)
-_GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type)
-#endif
-
#undef _GLIBCXX_MEM_FN_TRAITS
#undef _GLIBCXX_MEM_FN_TRAITS2
diff --git a/libstdc++-v3/testsuite/20_util/function_objects/mem_fn/80478.cc b/libstdc++-v3/testsuite/20_util/function_objects/mem_fn/80478.cc
deleted file mode 100644
index f49fcaa..0000000
--- a/libstdc++-v3/testsuite/20_util/function_objects/mem_fn/80478.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2017 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-// { dg-options "-std=gnu++17" }
-// { dg-do compile { target c++1z } }
-
-#include <functional>
-
-struct X {
- void f() noexcept { }
-};
-
-auto f = std::mem_fn(&X::f);
--
1.7.1