diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-06-07 16:16:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 16:16:06 -0700 |
| commit | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (patch) | |
| tree | 354094bec76d245e6ebb84aee358a2a9c3f58ae1 | |
| parent | 364516e8bc19f6435fd42893809080d4f64a3232 (diff) | |
Fixes for compatibility with new xcode 15 beta for any viewer branch after DRTVWR-577 (#232)
| -rw-r--r-- | indra/cmake/00-Common.cmake | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerthrottle.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index c848d00710..5ce49bc6b0 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 2729253d18..20390a316a 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; |