summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-04 20:08:18 +0000
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>2000-11-04 20:08:18 +0000
commit30a4c5f513670ddd780532bb96b9033d905455b6 (patch)
treec15e446fa808dc6fa14f716cf1e0020f5c47ea2f
parent0b0b1f137058986849740a580b41f5cd8f3964b9 (diff)
downloadgcc-30a4c5f513670ddd780532bb96b9033d905455b6.tar.gz
* g++.old-deja/g++.mike/net5.C: Put `abort' in `std' namespace.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37258 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.mike/net5.C5
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8a6c412fde1..00fbba66302 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
2000-11-04 Mark Mitchell <mark@codesourcery.com>
+ * g++.old-deja/g++.mike/net5.C: Put `abort' in `std' namespace.
+
* g++.old-deja/g++.mike/p755.C: Tweak handling of exit.
* g++.old-deja/g++.mike/p755a.C: Likewise.
* g++.old-deja/g++.mike/p9706.C: Don't assume that the standard
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net5.C b/gcc/testsuite/g++.old-deja/g++.mike/net5.C
index 064c73c79ae..665c0ba8188 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net5.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net5.C
@@ -1,7 +1,10 @@
// Build don't link:
// Special g++ Options:
+namespace std {
volatile void abort(); // WARNING - mismatch
+}
+
volatile void oink() {
- abort() ;
+ std::abort() ;
} // gets bogus error -