From 71e7c7c705434b8290d802b46c92c0eb808dd2f1 Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Wed, 7 Jun 2023 16:16:06 -0700
Subject: [PATCH] Fixes for compatibility with new xcode 15 beta for any viewer
branch after DRTVWR-577 (#232)
---
indra/cmake/00-Common.cmake | 4 ++++
indra/newview/llviewerthrottle.cpp | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index a44fe5a8d5e..c708199309c 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -171,6 +171,10 @@ if (DARWIN)
## Really?? On developer machines too?
##set(ENABLE_SIGNING TRUE)
##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+
+ # required for clang-15/xcode-15 since our boost package still uses deprecated std::unary_function/binary_function
+ # see https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#C++-Standard-Library
+ add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
endif (DARWIN)
if (LINUX OR DARWIN)
diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
index 2729253d183..20390a316ae 100644
--- a/indra/newview/llviewerthrottle.cpp
+++ b/indra/newview/llviewerthrottle.cpp
@@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup()
}
-LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[])
+LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[TC_EOF])
{
mThrottleTotal = 0.f;
S32 i;
--
GitLab