diff options
| author | Chris Robinson <[email protected]> | 2022-06-18 14:28:44 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-06-18 14:28:44 -0700 |
| commit | 97ab1afa35440e74dc775ccb88e454cedd2b532c (patch) | |
| tree | 69735baa847a1447faed0aebca0f7e767a225ca5 | |
| parent | bb320a7019949e6febb635c538adb6ac441a9756 (diff) | |
Rename a parameter to avoid a shadowing warning
| -rw-r--r-- | al/source.h | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/al/source.h b/al/source.h index b59f1ab7..5e88a7b3 100644 --- a/al/source.h +++ b/al/source.h @@ -712,14 +712,11 @@ private: // Active FX slot ID validators struct Eax4ActiveFxSlotIdValidator { - void operator()(const GUID& id) const + void operator()(const GUID &guid) const { - if (id != EAX_NULL_GUID && - id != EAX_PrimaryFXSlotID && - id != EAXPROPERTYID_EAX40_FXSlot0 && - id != EAXPROPERTYID_EAX40_FXSlot1 && - id != EAXPROPERTYID_EAX40_FXSlot2 && - id != EAXPROPERTYID_EAX40_FXSlot3) + if(guid != EAX_NULL_GUID && guid != EAX_PrimaryFXSlotID + && guid != EAXPROPERTYID_EAX40_FXSlot0 && guid != EAXPROPERTYID_EAX40_FXSlot1 + && guid != EAXPROPERTYID_EAX40_FXSlot2 && guid != EAXPROPERTYID_EAX40_FXSlot3) { eax_fail_unknown_active_fx_slot_id(); } @@ -727,14 +724,11 @@ private: }; struct Eax5ActiveFxSlotIdValidator { - void operator()(const GUID& id) const + void operator()(const GUID &guid) const { - if (id != EAX_NULL_GUID && - id != EAX_PrimaryFXSlotID && - id != EAXPROPERTYID_EAX50_FXSlot0 && - id != EAXPROPERTYID_EAX50_FXSlot1 && - id != EAXPROPERTYID_EAX50_FXSlot2 && - id != EAXPROPERTYID_EAX50_FXSlot3) + if(guid != EAX_NULL_GUID && guid != EAX_PrimaryFXSlotID + && guid != EAXPROPERTYID_EAX50_FXSlot0 && guid != EAXPROPERTYID_EAX50_FXSlot1 + && guid != EAXPROPERTYID_EAX50_FXSlot2 && guid != EAXPROPERTYID_EAX50_FXSlot3) { eax_fail_unknown_active_fx_slot_id(); } @@ -787,30 +781,30 @@ private: // ---------------------------------------------------------------------- struct Eax4SendIndexGetter { - EaxFxSlotIndexValue operator()(const GUID& id) const + EaxFxSlotIndexValue operator()(const GUID &guid) const { - if (id == EAXPROPERTYID_EAX40_FXSlot0) + if(guid == EAXPROPERTYID_EAX40_FXSlot0) return 0; - if (id == EAXPROPERTYID_EAX40_FXSlot1) + if(guid == EAXPROPERTYID_EAX40_FXSlot1) return 1; - if (id == EAXPROPERTYID_EAX40_FXSlot2) + if(guid == EAXPROPERTYID_EAX40_FXSlot2) return 2; - if (id == EAXPROPERTYID_EAX40_FXSlot3) + if(guid == EAXPROPERTYID_EAX40_FXSlot3) return 3; eax_fail_unknown_receiving_fx_slot_id(); } }; struct Eax5SendIndexGetter { - EaxFxSlotIndexValue operator()(const GUID& id) const + EaxFxSlotIndexValue operator()(const GUID &guid) const { - if (id == EAXPROPERTYID_EAX50_FXSlot0) + if(guid == EAXPROPERTYID_EAX50_FXSlot0) return 0; - if (id == EAXPROPERTYID_EAX50_FXSlot1) + if(guid == EAXPROPERTYID_EAX50_FXSlot1) return 1; - if (id == EAXPROPERTYID_EAX50_FXSlot2) + if(guid == EAXPROPERTYID_EAX50_FXSlot2) return 2; - if (id == EAXPROPERTYID_EAX50_FXSlot3) + if(guid == EAXPROPERTYID_EAX50_FXSlot3) return 3; eax_fail_unknown_receiving_fx_slot_id(); } |