aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2016-07-16 09:53:23 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2016-07-16 09:53:23 +0000
commita9356b1242b57fc99b2200e6c3d5039c9d4948fe (patch)
tree217de913bf6be55069c726bfa4405139fcfe5ab3
parent5a12c9131517541215f0ff86709302307204a690 (diff)
downloadgcc-a9356b1242b57fc99b2200e6c3d5039c9d4948fe.zip
gcc-a9356b1242b57fc99b2200e6c3d5039c9d4948fe.tar.gz
gcc-a9356b1242b57fc99b2200e6c3d5039c9d4948fe.tar.bz2
nullptr35.C (caught): Fix typo.
* g++.dg/cpp0x/nullptr35.C (caught): Fix typo. From-SVN: r238413
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/nullptr35.C2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2793b34..8de4e95 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-16 Andreas Schwab <schwab@linux-m68k.org>
+
+ * g++.dg/cpp0x/nullptr35.C (caught): Fix typo.
+
2016-07-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Marco Restelli <mrestelli@gmail.com>
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr35.C b/gcc/testsuite/g++.dg/cpp0x/nullptr35.C
index 2f93ce1..c84966f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr35.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr35.C
@@ -11,7 +11,7 @@ int result = 0;
void __attribute__((noinline))
caught(int bit)
{
- result &= bit;
+ result |= bit;
}
struct A { };