compiler: make comparison operator() methods const

    This is required for new versions of libstdc++ in C++17 mode.

    Fixes GCC PR 83102.

    Reviewed-on: https://go-review.googlesource.com/79396

From-SVN: r255062

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index c0415a6d0deb2f83df69439b5625746684ae4bf3..0bd1dab7de3d3ea7d342d60008d4977507419f19 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-178c00f929e6268f24f0c9dd9eb69d3d14d8096e
+1db7dc97d01ee230ff4874ce1c9775a24ffd16ac
 
 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/gogo.h b/gcc/go/gofrontend/gogo.h
index 345a15df570f67034975c2a6a11ce4fc879b65fd..338770f5c3c0ebaf15614d71f95af7fe3a13a0cf 100644 (file)
--- a/gcc/go/gofrontend/gogo.h
+++ b/gcc/go/gofrontend/gogo.h
@@ -117,7 +117,7 @@ class Import_init
 // For sorting purposes.
 
 struct Import_init_lt {
-  bool operator()(const Import_init* i1, const Import_init* i2)
+  bool operator()(const Import_init* i1, const Import_init* i2) const
   {
     return i1->init_name() < i2->init_name();
   }

diff --git a/gcc/go/gofrontend/parse.cc b/gcc/go/gofrontend/parse.cc
index 28b1772f084f044ea477a69e99296fe7f3e4d827..f7d53af6e2131b980711299c27d3cabc632388cf 100644 (file)
--- a/gcc/go/gofrontend/parse.cc
+++ b/gcc/go/gofrontend/parse.cc
@@ -20,7 +20,7 @@
 
 bool
 Parse::Enclosing_var_comparison::operator()(const Enclosing_var& v1,
-                                           const Enclosing_var& v2)
+                                           const Enclosing_var& v2) const
 {
   if (v1.var() == v2.var())
     return false;

diff --git a/gcc/go/gofrontend/parse.h b/gcc/go/gofrontend/parse.h
index e416072830d780b3efebd895c228e9d3c3f205a8..2ba84579e6c0dd29661d7de57eb1af8605026418 100644 (file)
--- a/gcc/go/gofrontend/parse.h
+++ b/gcc/go/gofrontend/parse.h
@@ -127,7 +127,7 @@ class Parse
   struct Enclosing_var_comparison
   {
     bool
-    operator()(const Enclosing_var&, const Enclosing_var&);
+    operator()(const Enclosing_var&, const Enclosing_var&) const;
   };
 
   // A set of Enclosing_var entries.