Fixes for compatibility with new xcode 15 beta for any viewer branch …

…after DRTVWR-577 (secondlife#232)
Ansariel · Jul 18, 2023 · 71e7c7c · 71e7c7c
1 parent bc3f2d5
commit 71e7c7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup()
 }
 
 
-LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[])
+LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[TC_EOF])
 {
 	mThrottleTotal = 0.f;
 	S32 i;
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup() @@
     }
-    LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[])
+    LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[TC_EOF])
     {
     	mThrottleTotal = 0.f;
     	S32 i;
@@ Expand Down @@