Hi Dimitry, > On 7 Mar 2024, at 16:48, Dimitry Andric <dimi...@andric.com> wrote: > > Ref: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111632 > > Use INCLUDE_VECTOR before including system.h, instead of directly > including <vector>, to avoid running into poisoned identifiers.
I would say that the patch itself is obvious, but you have not mentioned how it was tested? thanks Iain > > Signed-off-by: Dimitry Andric <dimi...@andric.com> > --- > libcc1/libcc1plugin.cc | 3 +-- > libcc1/libcp1plugin.cc | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc > index 72d17c3b81c..e64847466f4 100644 > --- a/libcc1/libcc1plugin.cc > +++ b/libcc1/libcc1plugin.cc > @@ -32,6 +32,7 @@ > #undef PACKAGE_VERSION > > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "gcc-plugin.h" > #include "system.h" > #include "coretypes.h" > @@ -69,8 +70,6 @@ > #include "gcc-c-interface.h" > #include "context.hh" > > -#include <vector> > - > using namespace cc1_plugin; > > > diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc > index 0eff7c68d29..da68c5d0ac1 100644 > --- a/libcc1/libcp1plugin.cc > +++ b/libcc1/libcp1plugin.cc > @@ -33,6 +33,7 @@ > #undef PACKAGE_VERSION > > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "gcc-plugin.h" > #include "system.h" > #include "coretypes.h" > @@ -71,8 +72,6 @@ > #include "rpc.hh" > #include "context.hh" > > -#include <vector> > - > using namespace cc1_plugin; > > > -- > 2.43.2 >
