public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* Undefine ERROR in g++.dg/tree-ssa/copyprop.C
@ 2020-12-22 21:41 Alexandre Oliva
  2020-12-29 18:34 ` Mike Stump
  0 siblings, 1 reply; 2+ messages in thread
From: Alexandre Oliva @ 2020-12-22 21:41 UTC (permalink / raw)
  To: gcc-patches


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

Regstrapped on x86_64-linux-gnu, and tested with -x-arm-wrs-vxworks7r2.
Ok to install?


from Jerome Lambourg <lambourg@adacore.com>
for  gcc/testsuite/ChangeLog

	* g++.dg/tree-ssa/copyprop.C: Undefine ERROR if defined.
---
 gcc/testsuite/g++.dg/tree-ssa/copyprop.C |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gcc/testsuite/g++.dg/tree-ssa/copyprop.C b/gcc/testsuite/g++.dg/tree-ssa/copyprop.C
index 8c05895e45ec6..bc9167ad1201f 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 { };

-- 
Alexandre Oliva, happy hacker  https://FSFLA.org/blogs/lxo/
   Free Software Activist         GNU Toolchain Engineer
        Vim, Vi, Voltei pro Emacs -- GNUlius Caesar

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Undefine ERROR in g++.dg/tree-ssa/copyprop.C
  2020-12-22 21:41 Undefine ERROR in g++.dg/tree-ssa/copyprop.C Alexandre Oliva
@ 2020-12-29 18:34 ` Mike Stump
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Stump @ 2020-12-29 18:34 UTC (permalink / raw)
  To: Alexandre Oliva; +Cc: gcc-patches

On Dec 22, 2020, at 1:41 PM, Alexandre Oliva <oliva@adacore.com> wrote:
> 
> VxWorks headers define ERROR as a macro, which conflicts with the use
> in the test.
> 
> Regstrapped on x86_64-linux-gnu, and tested with -x-arm-wrs-vxworks7r2.
> Ok to install?

Ok.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-12-29 18:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-22 21:41 Undefine ERROR in g++.dg/tree-ssa/copyprop.C Alexandre Oliva
2020-12-29 18:34 ` Mike Stump

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).