https://gcc.gnu.org/g:5213047b1d50af63dfabb5e5649821a6cb157e33

commit r14-9500-g5213047b1d50af63dfabb5e5649821a6cb157e33
Author: Francois-Xavier Coudert <fxcoud...@gcc.gnu.org>
Date:   Sat Mar 16 09:50:00 2024 +0100

    libcc1: fix <vector> include
    
    Use INCLUDE_VECTOR before including system.h, instead of directly
    including <vector>, to avoid running into poisoned identifiers.
    
    Signed-off-by: Dimitry Andric <dimi...@andric.com>
    
    libcc1/ChangeLog:
    
            PR middle-end/111632
            * libcc1plugin.cc: Fix include.
            * libcp1plugin.cc: Fix include.

Diff:
---
 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;

Reply via email to