1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
https://bugs.gentoo.org/914565
--- a/gcc/gcc/system.h
+++ b/gcc/gcc/system.h
@@ -201,6 +201,9 @@ extern int fprintf_unlocked (FILE *, con
#ifdef INCLUDE_STRING
# include <string>
#endif
+#ifdef INCLUDE_VECTOR
+# include <vector>
+#endif
#endif
/* There are an extraordinary number of issues with <ctype.h>.
@@ -229,9 +232,6 @@ extern int errno;
#ifdef INCLUDE_SET
# include <set>
#endif
-#ifdef INCLUDE_VECTOR
-# include <vector>
-#endif
#ifdef INCLUDE_ARRAY
# include <array>
#endif
--- a/gcc/libcc1/libcc1plugin.cc
+++ b/gcc/libcc1/libcc1plugin.cc
@@ -19,6 +19,8 @@
#include <cc1plugin-config.h>
+#include <vector>
+
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
@@ -69,8 +71,6 @@
#include "gcc-c-interface.h"
#include "context.hh"
-#include <vector>
-
using namespace cc1_plugin;
--- a/gcc/libcc1/libcp1plugin.cc
+++ b/gcc/libcc1/libcp1plugin.cc
@@ -20,6 +20,8 @@
#include <cc1plugin-config.h>
+#include <vector>
+
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
@@ -71,8 +73,6 @@
#include "rpc.hh"
#include "context.hh"
-#include <vector>
-
using namespace cc1_plugin;
|
