commit 726eae21161a7a21fe218b98097e14069eda237c
author Takuto Ikuta <tikuta@google.com> Wed Oct 17 20:18:59 2018 +0900
committer Luca Stefani <luca.stefani.ge1@gmail.com> Tue Mar 05 21:10:50 2019 +0100
tree 7a2f66ab6d6c7880d7770f0f8665095f034db06f
parent 37354fe5a5307bc1041e05ad2a48104e19ab4fe5

Cherry-pick: Specify const for operator()

Upstream commit: https://github.com/googlei18n/sfntly/commit/b55ff303ea2f9e26702b514cf6a3196a2e3e2974

Fixes https://crbug.com/683349

Test: m libsfntly
Change-Id: I092f6b31b29ce3c33fa9fd56331662c9cc8de10a

Android.bp

diff --git a/Android.bp b/Android.bp
index ebd9400..f26585d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,9 +122,6 @@
         "-Wno-error=c++0x-compat",
         "-Wno-non-virtual-dtor",
         "-Wno-sign-promo",
-
-        // Temporarily suppress the warning http://b/37911198
-        "-Wno-error=user-defined-warnings",
     ],
 
     debug: {

cpp/src/sfntly/table/header.cc

diff --git a/cpp/src/sfntly/table/header.cc b/cpp/src/sfntly/table/header.cc
index 672ace5..eb8fd75 100644
--- a/cpp/src/sfntly/table/header.cc
+++ b/cpp/src/sfntly/table/header.cc
@@ -54,12 +54,12 @@
 Header::~Header() {}
 
 bool HeaderComparatorByOffset::operator() (const HeaderPtr lhs,
-                                           const HeaderPtr rhs) {
+                                           const HeaderPtr rhs) const {
   return lhs->offset_ > rhs->offset_;
 }
 
 bool HeaderComparatorByTag::operator() (const HeaderPtr lhs,
-                                        const HeaderPtr rhs) {
+                                        const HeaderPtr rhs) const {
   return lhs->tag_ > rhs->tag_;
 }
 

cpp/src/sfntly/table/header.h

diff --git a/cpp/src/sfntly/table/header.h b/cpp/src/sfntly/table/header.h
index 280e556..7744a21 100644
--- a/cpp/src/sfntly/table/header.h
+++ b/cpp/src/sfntly/table/header.h
@@ -89,21 +89,21 @@
  public:
   virtual ~HeaderComparator() {}
   virtual bool operator()(const HeaderPtr h1,
-                          const HeaderPtr h2) = 0;
+                          const HeaderPtr h2) const = 0;
 };
 
 class HeaderComparatorByOffset : public HeaderComparator {
  public:
   virtual ~HeaderComparatorByOffset() {}
   virtual bool operator()(const HeaderPtr h1,
-                          const HeaderPtr h2);
+                          const HeaderPtr h2) const;
 };
 
 class HeaderComparatorByTag : public HeaderComparator {
  public:
   virtual ~HeaderComparatorByTag() {}
   virtual bool operator()(const HeaderPtr h1,
-                          const HeaderPtr h2);
+                          const HeaderPtr h2) const;
 };
 
 typedef std::set<HeaderPtr, HeaderComparatorByOffset> HeaderOffsetSortedSet;