diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2021-01-18 15:17:50 +0100 |
|---|---|---|
| committer | Philip Herron <herron.philip@googlemail.com> | 2021-01-18 17:45:59 +0000 |
| commit | c55cd0e10c00d66cf159fc8f3f309186e1a576d1 (patch) | |
| tree | ec79735b903517574054f8bc17af79e28cb55695 /gcc | |
| parent | 2b7518cf8ae5e34aec81dbb8efb6ea15bb95c68c (diff) | |
| download | gcc-c55cd0e10c00d66cf159fc8f3f309186e1a576d1.zip gcc-c55cd0e10c00d66cf159fc8f3f309186e1a576d1.tar.gz gcc-c55cd0e10c00d66cf159fc8f3f309186e1a576d1.tar.bz2 | |
Fix '#include <algorithm>'
GCC doesn't like that:
In file included from [...]
./mm_malloc.h:42:12: error: attempt to use poisoned "malloc"
return malloc (__size);
^
See commit e7b3f654f2ab0400c95c0517387a9ad645a5c4cd, for example.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 2 | ||||
| -rw-r--r-- | gcc/rust/parse/rust-parse.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/rust-system.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index f6bd0f6..7b72bbb 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -22,8 +22,6 @@ along with GCC; see the file COPYING3. If not see #include "rust-diagnostics.h" -#include <algorithm> // for std::find - namespace Rust { // Left binding powers of operations. enum binding_powers diff --git a/gcc/rust/parse/rust-parse.cc b/gcc/rust/parse/rust-parse.cc index 62076ee..fdad97c 100644 --- a/gcc/rust/parse/rust-parse.cc +++ b/gcc/rust/parse/rust-parse.cc @@ -41,8 +41,6 @@ along with GCC; see the file COPYING3. If not see #endif // maybe put these back in if compiling no longer works -#include <algorithm> // for std::find - /* TODO: move non-essential stuff back here from rust-parse-impl.h after * confirming that it works */ diff --git a/gcc/rust/rust-system.h b/gcc/rust/rust-system.h index 26c9b33..d62e676 100644 --- a/gcc/rust/rust-system.h +++ b/gcc/rust/rust-system.h @@ -20,6 +20,7 @@ #ifndef RUST_SYSTEM_H #define RUST_SYSTEM_H +#define INCLUDE_ALGORITHM #include "config.h" /* Define this so that inttypes.h defines the PRI?64 macros even @@ -30,7 +31,6 @@ // These must be included before the #poison declarations in system.h. -#include <algorithm> #include <string> #include <list> #include <map> |