diff options
author | vichang <vichang@google.com> | 2019-03-06 10:38:28 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-06 10:38:28 -0800 |
commit | d4096d3eb0321206281b0a0af2731b8e8b79b1ec (patch) | |
tree | 7a2f66ab6d6c7880d7770f0f8665095f034db06f | |
parent | 743f46fe736ae4f47234ddd66f8e70c4ce1edc93 (diff) | |
parent | 687dd77c4272ad47618ba1554a3e11e2bccd013f (diff) | |
download | sfntly-d4096d3eb0321206281b0a0af2731b8e8b79b1ec.tar.gz |
Merge "Cherry-pick: Specify const for operator()" am: c3abb42e4e am: 345e0bb879
am: 687dd77c42
Change-Id: I9d446e88c6b667d5f843eaa6c268968005068540
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cpp/src/sfntly/table/header.cc | 4 | ||||
-rw-r--r-- | cpp/src/sfntly/table/header.h | 6 |
3 files changed, 5 insertions, 8 deletions
@@ -122,9 +122,6 @@ cc_library_static { "-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: { 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(int32_t tag, int64_t checksum, int32_t offset, int32_t length) 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_; } 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 @@ class HeaderComparator { 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; |