[gcc r12-10547] libcc1: fix <vector> include

Iain D Sandoe iains@gcc.gnu.org
Tue Jun 11 18:07:42 GMT 2024


https://gcc.gnu.org/g:8f11ed1c58e14421ba4be1652764fc47fdce8dc7

commit r12-10547-g8f11ed1c58e14421ba4be1652764fc47fdce8dc7
Author: Francois-Xavier Coudert <fxcoudert@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 <dimitry@andric.com>
    
            PR middle-end/111632
    
    libcc1/ChangeLog:
    
            * libcc1plugin.cc: Fix include.
            * libcp1plugin.cc: Fix include.
    
    (cherry picked from commit 5213047b1d50af63dfabb5e5649821a6cb157e33)

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 bdd0bdabe77f..8d96667e33bd 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 e2d5039a0a1f..6c93e9121343 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;


More information about the Gcc-cvs mailing list