Skip to content
Snippets Groups Projects
Commit 71e7c7c7 authored by Brad Linden's avatar Brad Linden Committed by marchcat-pe
Browse files

Fixes for compatibility with new xcode 15 beta for any viewer branch after DRTVWR-577 (#232)

parent bc3f2d53
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/cmake/00-Common.cmake
+ 4
− 0
View file @ 71e7c7c7
...@@ -171,6 +171,10 @@ if (DARWIN) ...@@ -171,6 +171,10 @@ if (DARWIN)
## Really?? On developer machines too? ## Really?? On developer machines too?
##set(ENABLE_SIGNING TRUE) ##set(ENABLE_SIGNING TRUE)
##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.") ##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) endif (DARWIN)
if (LINUX OR DARWIN) if (LINUX OR DARWIN)
......
indra/newview/llviewerthrottle.cpp
+ 1
− 1
View file @ 71e7c7c7
...@@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup() ...@@ -84,7 +84,7 @@ LLViewerThrottleGroup::LLViewerThrottleGroup()
} }
LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[]) LLViewerThrottleGroup::LLViewerThrottleGroup(const F32 settings[TC_EOF])
{ {
mThrottleTotal = 0.f; mThrottleTotal = 0.f;
S32 i; S32 i;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment