livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1539 from secondlife/nat/kwds 

Change `LLPredicate::Rule::requires()` to `mandates()` for C++20.
meow-7.2.2
nat-goodspeed 2024-05-22 10:21:28 -04:00 committed by GitHub
parent 47985e5822 eb81d5f23f
commit ef8f481982
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llcommon/llpredicate.h
View File

@ -139,10 +139,10 @@ namespace LLPredicate
Rule()
{}
void require(ENUM e, bool match)
{
mRule.set(e, match);
}
void mandate(ENUM e, bool match)
{
mRule.set(e, match);
}
void allow(ENUM e)
{
@ -154,10 +154,10 @@ namespace LLPredicate
return (mRule && value).someSet();
}
bool requires(const Value<ENUM> value) const
{
return (mRule && value).someSet() && (!mRule && value).noneSet();
}
bool mandates(const Value<ENUM> value) const
{
return (mRule && value).someSet() && (!mRule && value).noneSet();
}
bool isAmbivalent(const Value<ENUM> value) const
{

2
indra/newview/CMakeLists.txt
View File

@ -2128,7 +2128,7 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN
OUTPUT_STRIP_TRAILING_WHITESPACE)
add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"
# Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.xz;
# Use of 'tar ...J' here assumes VIEWER_SYMBOL_FILE endswith .tar.xz;
# testing a string suffix is painful enough in CMake language that
# we'll continue assuming it until forced to generalize.
COMMAND "tar"