From ad340466d09ae6de8adc20949f433772cb016b54 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Sat, 18 Jul 2020 20:42:28 +0200 Subject: Misc: Use [[fallthrough]] attribute instead of comment to mark intentional fallthroughs (#25054) Related: #25006 (cherry picked from commit 85b5b842ca6c05d4e51081e6c3282940a80f3761) --- src/server/game/Conditions/ConditionMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Conditions/ConditionMgr.cpp') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 490881071ec..929d9ec0275 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -2155,7 +2155,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const TC_LOG_ERROR("sql.sql", "%s has invalid state mask (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue2); return false; } - /* fallthrough */ + [[fallthrough]]; case CONDITION_QUESTREWARDED: case CONDITION_QUESTTAKEN: case CONDITION_QUEST_NONE: @@ -2274,7 +2274,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const case CONDITION_OBJECT_ENTRY_GUID_LEGACY: cond->ConditionType = CONDITION_OBJECT_ENTRY_GUID; cond->ConditionValue1 = Trinity::Legacy::ConvertLegacyTypeID(Trinity::Legacy::TypeID(cond->ConditionValue1)); - /* fallthrough */ + [[fallthrough]]; case CONDITION_OBJECT_ENTRY_GUID: { switch (cond->ConditionValue1) @@ -2341,7 +2341,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const case CONDITION_TYPE_MASK_LEGACY: cond->ConditionType = CONDITION_TYPE_MASK; cond->ConditionValue1 = Trinity::Legacy::ConvertLegacyTypeMask(cond->ConditionValue1); - /* fallthrough */ + [[fallthrough]]; case CONDITION_TYPE_MASK: { if (!cond->ConditionValue1 || (cond->ConditionValue1 & ~(TYPEMASK_UNIT | TYPEMASK_PLAYER | TYPEMASK_GAMEOBJECT | TYPEMASK_CORPSE))) -- cgit v1.2.3