From f82548b931af69a08d53818ec7a96a967c05151c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 31 Mar 2018 10:59:39 -0400
Subject: MAINT-8474: Xcode 9.3 insists that comparators use const operator().
---
indra/newview/lltextureview.cpp | 2 +-
indra/newview/llviewerregion.h | 2 +-
indra/newview/llvocache.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index b7786bcdd7..6da13da58c 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -736,7 +736,7 @@ LLTextureView::~LLTextureView()
typedef std::pair<F32,LLViewerFetchedTexture*> decode_pair_t;
struct compare_decode_pair
{
- bool operator()(const decode_pair_t& a, const decode_pair_t& b)
+ bool operator()(const decode_pair_t& a, const decode_pair_t& b) const
{
return a.first > b.first;
}
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 69fb9c4d4e..302647215f 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -440,7 +440,7 @@ public:
struct CompareRegionByLastUpdate
{
- bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs)
+ bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) const
{
S32 lpa = lhs->getLastUpdate();
S32 rpa = rhs->getLastUpdate();
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index 7d450c5231..594d38249b 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -59,7 +59,7 @@ public:
struct CompareVOCacheEntry
{
- bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs)
+ bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) const
{
F32 lpa = lhs->getSceneContribution();
F32 rpa = rhs->getSceneContribution();
--
cgit v1.2.3