aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Accounts/RBAC.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Accounts/RBAC.cpp')
-rw-r--r--src/server/game/Accounts/RBAC.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Accounts/RBAC.cpp b/src/server/game/Accounts/RBAC.cpp
index 242587fec5e..2b79a79cdb8 100644
--- a/src/server/game/Accounts/RBAC.cpp
+++ b/src/server/game/Accounts/RBAC.cpp
@@ -213,8 +213,8 @@ void RBACData::LoadFromDBCallback(PreparedQueryResult result)
// Add default permissions
RBACPermissionContainer const& permissions = sAccountMgr->GetRBACDefaultPermissions(_secLevel);
- for (RBACPermissionContainer::const_iterator itr = permissions.begin(); itr != permissions.end(); ++itr)
- GrantPermission(*itr);
+ for (uint32 permission : permissions)
+ GrantPermission(permission);
// Force calculation of permissions
CalculateNewPermissions();
@@ -234,14 +234,14 @@ void RBACData::CalculateNewPermissions()
void RBACData::AddPermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
{
- for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
- permsTo.insert(*itr);
+ for (uint32 permission : permsFrom)
+ permsTo.insert(permission);
}
void RBACData::RemovePermissions(RBACPermissionContainer& permsFrom, RBACPermissionContainer const& permsToRemove)
{
- for (RBACPermissionContainer::const_iterator itr = permsToRemove.begin(); itr != permsToRemove.end(); ++itr)
- permsFrom.erase(*itr);
+ for (uint32 permission: permsToRemove)
+ permsFrom.erase(permission);
}
void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)
@@ -264,9 +264,9 @@ void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)
// add all linked permissions (that are not already expanded) to the list of permissions to be checked
RBACPermissionContainer const& linkedPerms = permission->GetLinkedPermissions();
- for (RBACPermissionContainer::const_iterator itr = linkedPerms.begin(); itr != linkedPerms.end(); ++itr)
- if (permissions.find(*itr) == permissions.end())
- toCheck.insert(*itr);
+ for (uint32 linkedPerm : linkedPerms)
+ if (permissions.find(linkedPerm) == permissions.end())
+ toCheck.insert(linkedPerm);
}
TC_LOG_DEBUG("rbac", "RBACData::ExpandPermissions: Expanded: %s", GetDebugPermissionString(permissions).c_str());