From: Jerome Lambourg <lambourg@adacore.com>
Date: Fri, 1 Jan 2021 04:55:01 +0000 (-0300)
Subject: Undefine ERROR in g++.dg/tree-ssa/copyprop.C
X-Git-Tag: basepoints/gcc-12~1864
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aba274de204e1d401a20b95d78555f045ae49f0;p=thirdparty%2Fgcc.git

Undefine ERROR in g++.dg/tree-ssa/copyprop.C

VxWorks headers define ERROR as a macro, which conflicts with the use
in the test.


for  gcc/testsuite/ChangeLog

	* g++.dg/tree-ssa/copyprop.C: Undefine ERROR if defined.
---

diff --git a/gcc/testsuite/g++.dg/tree-ssa/copyprop.C b/gcc/testsuite/g++.dg/tree-ssa/copyprop.C
index 8c05895e45ec..bc9167ad1201 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/copyprop.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/copyprop.C
@@ -8,6 +8,11 @@
 #include <vector>
 #include <iostream>
 #include <cstdlib>
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
 using namespace std;
 template<typename _FIter, typename _Tp> _FIter lower_bound(_FIter, _FIter, _Tp&);
 template<class _Key> struct hash { };