From d626b49cc40339d3c7621da2542455118f7caec8 Mon Sep 17 00:00:00 2001 From: Boris Tasevski Date: Wed, 6 Jul 2022 15:44:28 +0200 Subject: [PATCH] no return fixed; removed explicit keyword from LabelPermissions --- src/auth/models.cpp | 2 ++ src/auth/models.hpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/auth/models.cpp b/src/auth/models.cpp index 7bc998215..3825cf629 100644 --- a/src/auth/models.cpp +++ b/src/auth/models.cpp @@ -368,6 +368,8 @@ LabelPermissions User::GetLabelPermissions() const { std::set_union(labelPermissions_.denies().begin(), labelPermissions_.denies().end(), role_->labelPermissions().denies().begin(), role_->labelPermissions().denies().end(), std::inserter(resultDenies, resultDenies.begin())); + + return {resultGrants, resultDenies}; } return labelPermissions_; } diff --git a/src/auth/models.hpp b/src/auth/models.hpp index ec71e8666..56e6fb9ea 100644 --- a/src/auth/models.hpp +++ b/src/auth/models.hpp @@ -91,8 +91,8 @@ bool operator!=(const Permissions &first, const Permissions &second); class LabelPermissions final { public: - explicit LabelPermissions(const std::unordered_set &grants = {}, - const std::unordered_set &denies = {}); + LabelPermissions(const std::unordered_set &grants = {}, + const std::unordered_set &denies = {}); PermissionLevel Has(const std::string &permission) const;