aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-09 17:21:01 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-09 17:21:01 +0000
commit1eac10b39f164c3010fe8fee2fed3269fa832967 (patch)
treeb484e8b26b15d616b040efc679e344a611ba2f6b
parent888e79a7c2311af2d585842b04c796af6e1046b2 (diff)
downloadgcc-1eac10b39f164c3010fe8fee2fed3269fa832967.zip
gcc-1eac10b39f164c3010fe8fee2fed3269fa832967.tar.gz
gcc-1eac10b39f164c3010fe8fee2fed3269fa832967.tar.bz2
compiler: use macro Unordered_map instead of std::unordered_map
Per gcc/go/go-system.h, this is what it is supposed to be, to support wider platforms. Reviewed-on: https://go-review.googlesource.com/85975 From-SVN: r256389
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/escape.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d836309..9ed2078 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-dbc0c7e4329aada2ae3554c20cfb8cfa48041213
+0445dc01fd75325ff99f839cfaab29cb9f2a1f97
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/escape.cc b/gcc/go/gofrontend/escape.cc
index 8706808..50878ff 100644
--- a/gcc/go/gofrontend/escape.cc
+++ b/gcc/go/gofrontend/escape.cc
@@ -858,7 +858,7 @@ Gogo::analyze_escape()
// Propagate levels across each dst. This is the flood phase.
std::set<Node*> dsts = context->dsts();
- std::unordered_map<Node*, int> escapes;
+ Unordered_map(Node*, int) escapes;
for (std::set<Node*>::iterator n = dsts.begin();
n != dsts.end();
++n)