From ad11cc8d8a62991654e4c7865dfd75c6dd46acaf Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 25 Feb 2022 15:47:11 +0100 Subject: [PATCH] reinstall fontconfig as needed; const an imbigious == operator --- CI/before_install.osx.sh | 2 +- apps/openmw/mwrender/globalmap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index ec4ece6343..b3463aa9b8 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -9,7 +9,7 @@ brew update --quiet [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true # Some of these tools can come from places other than brew, so check before installing -[ -z "${TRAVIS}" ] && brew install fontconfig +[ -z "${TRAVIS}" ] && brew reinstall fontconfig command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt@5 diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp index acd566ff18..dca26a220f 100644 --- a/apps/openmw/mwrender/globalmap.cpp +++ b/apps/openmw/mwrender/globalmap.cpp @@ -453,7 +453,7 @@ namespace MWRender : mLeft(left), mTop(top), mRight(right), mBottom(bottom) { } - bool operator == (const Box& other) + bool operator == (const Box& other) const { return mLeft == other.mLeft && mTop == other.mTop && mRight == other.mRight && mBottom == other.mBottom; }