From 5c0f24d0db7da7f83f2dc5d8dc8700d08b8c9e7c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 21 Sep 2010 15:12:58 +0100 Subject: [PATCH] =?utf8?q?re=20PR=20c++/45645=20(pr44972.C=20fails=20with?= =?utf8?q?=20error:=20=E2=80=98=5F=5Fassert=5Ffail=E2=80=99=20was=20not=20?= =?utf8?q?declared=20in=20this=20scope)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2010-09-21 Jonathan Wakely Jack Howarth PR c++/45645 * g++.dg/torture/pr44972.C: Use portable assert(). Co-Authored-By: Jack Howarth From-SVN: r164479 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/torture/pr44972.C | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b00b8917df9..fd14eab5918 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-09-21 Jonathan Wakely + Jack Howarth + + PR c++/45645 + * g++.dg/torture/pr44972.C: Use portable assert(). + 2010-09-21 Richard Guenther PR tree-optimization/45580 diff --git a/gcc/testsuite/g++.dg/torture/pr44972.C b/gcc/testsuite/g++.dg/torture/pr44972.C index 81806076c58..e409148da1c 100644 --- a/gcc/testsuite/g++.dg/torture/pr44972.C +++ b/gcc/testsuite/g++.dg/torture/pr44972.C @@ -74,7 +74,7 @@ class optional : public optional_base T const& get() const ; - T const* operator->() const { ((this->is_initialized()) ? static_cast (0) : __assert_fail ("this->is_initialized()", "pr44972.C", 78, __PRETTY_FUNCTION__)) ; return this->get_ptr_impl() ; } + T const* operator->() const { assert(this->is_initialized()) ; return this->get_ptr_impl() ; } } ; -- 2.30.2