diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-05-22 10:21:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 10:21:28 -0400 |
| commit | ef8f4819822288e044ea719feb6af7a1f4df4c4e (patch) | |
| tree | 5c1ba76e722d9630fa597023a1e6c196a04f758c | |
| parent | 47985e5822ce9fdebb7443e13b3c1a781a842ecd (diff) | |
| parent | eb81d5f23fc725f53857d7a62923e273a057c455 (diff) | |
Merge pull request #1539 from secondlife/nat/kwds
Change `LLPredicate::Rule::requires()` to `mandates()` for C++20.
| -rw-r--r-- | indra/llcommon/llpredicate.h | 16 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcommon/llpredicate.h b/indra/llcommon/llpredicate.h index e6c56a5711..205f08421f 100644 --- a/indra/llcommon/llpredicate.h +++ b/indra/llcommon/llpredicate.h @@ -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 { diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c4e529a684..6c2cfb3e6b 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -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" |