]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libcc1: fix <vector> include
authorFrancois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Sat, 16 Mar 2024 08:50:00 +0000 (09:50 +0100)
committerIain Sandoe <iain@sandoe.co.uk>
Tue, 11 Jun 2024 18:06:42 +0000 (19:06 +0100)
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)

libcc1/libcc1plugin.cc
libcc1/libcp1plugin.cc

index bdd0bdabe77f8c8e7d45c94eec68b1b4f77db09e..8d96667e33bdc3e532acd44383c470b17db88f9e 100644 (file)
@@ -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;
 
 \f
index e2d5039a0a1f3b2a18db7ac7fca696dab52a4fcc..6c93e91213439764431ee1ff00d1a94458e1615b 100644 (file)
@@ -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;
 
 \f