summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-09-05 11:30:54 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2017-09-05 11:30:54 +0100
commit3a99ed55e172795d2f88f18e2d694c9cfec78133 (patch)
treebcd0d3ce7e4dd7b6dd41452a74673b7dadccd198 /libstdc++-v3
parentfa0705724a2eb71f1bfc1a77121bcacd0108f137 (diff)
downloadgcc-3a99ed55e172795d2f88f18e2d694c9cfec78133.tar.gz
Remove owner_less<void> test that fails on gcc-6-branch
* testsuite/20_util/owner_less/noexcept.cc: Remove owner_less<void> tests. From-SVN: r251708
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc9
2 files changed, 5 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8a87b7b155a..d88a08f2452 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-05 Jonathan Wakely <jwakely@redhat.com>
+
+ * testsuite/20_util/owner_less/noexcept.cc: Remove owner_less<void>
+ tests.
+
2017-09-04 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
diff --git a/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc b/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc
index 25c9afde8e1..fcf5d4f2679 100644
--- a/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc
+++ b/libstdc++-v3/testsuite/20_util/owner_less/noexcept.cc
@@ -29,12 +29,3 @@ const std::owner_less<std::weak_ptr<int>> owi;
static_assert( noexcept(owi(wi, wi)), "" );
static_assert( noexcept(owi(si, wi)), "" );
static_assert( noexcept(owi(wi, si)), "" );
-const std::shared_ptr<long> sl;
-const std::weak_ptr<char> wc;
-const std::owner_less<void> ov;
-static_assert( noexcept(ov(si, si)), "" );
-static_assert( noexcept(ov(si, sl)), "" );
-static_assert( noexcept(ov(sl, si)), "" );
-static_assert( noexcept(ov(si, wc)), "" );
-static_assert( noexcept(ov(wc, si)), "" );
-static_assert( noexcept(ov(wc, wi)), "" );