diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2024-09-28 00:36:12 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@posteo.nl> | 2024-09-28 00:36:12 +0200 |
| commit | dc64ac19fd74694a6e9ecf0cb68e3f83257c93b9 (patch) | |
| tree | 623dd4a5731b1b90eb7d595758f8cc639cc32ba3 /indra/newview/rlvdefines.h | |
| parent | e03ad4913fd9dc12d9efcdd3854885a1622277ef (diff) | |
Replace None and Success. Those are X11 defines and thus lead to compile errors
when compiling a Linux viewer.
Diffstat (limited to 'indra/newview/rlvdefines.h')
| -rw-r--r-- | indra/newview/rlvdefines.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index 15baf1ba49..e3472ed4a8 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -102,7 +102,7 @@ namespace Rlv enum class EBehaviourOptionType { - None, // Behaviour takes no parameters + EmptyOrException, // Behaviour takes no parameters Exception, // Behaviour requires an exception as a parameter NoneOrException, // Behaviour takes either no parameters or an exception }; @@ -120,7 +120,7 @@ namespace Rlv enum class ECmdRet { Unknown = 0x0000, // Unknown error (should only be used internally) Retained, // Command was retained - Success = 0x0100, // Command executed successfully + Succeeded = 0x0100, // Command executed successfully SuccessUnset, // Command executed successfully (RLV_TYPE_REMOVE for an unrestricted behaviour) SuccessDuplicate, // Command executed successfully (RLV_TYPE_ADD for an already restricted behaviour) SuccessDeprecated, // Command executed successfully but has been marked as deprecated @@ -163,7 +163,7 @@ namespace Rlv constexpr bool isReturnCodeSuccess(ECmdRet eRet) { - return (to_underlying(eRet) & to_underlying(ECmdRet::Success)) == to_underlying(ECmdRet::Success); + return (to_underlying(eRet) & to_underlying(ECmdRet::Succeeded)) == to_underlying(ECmdRet::Succeeded); } constexpr bool isReturnCodeFailed(ECmdRet eRet) |