feat: fix build warnings for all targets (#236)

fix: CMake import issues fix: virtual destructor warning chore: removed auto generated files
casbin · Sep 5, 2023 · f6561a4 · f6561a4
1 parent 3e42413
commit f6561a4
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -361,6 +361,7 @@ MigrationBackup/
 cmake-build/
 xcode-build/
 cmake-build*/
+build_support/
 
 # pip
 *.egg-info

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
 
 project(
     casbin
-    VERSION 1.44.0
+    VERSION 1.53.2
     DESCRIPTION "An authorization library that supports access control models like ACL, RBAC, ABAC in C/C++"
     HOMEPAGE_URL https://github.com/casbin/casbin-cpp
     LANGUAGES CXX C

diff --git a/build_support/clang_format_exclusions.txt b/build_support/clang_format_exclusions.txt
diff --git a/build_support/run_clang_format.py b/build_support/run_clang_format.py
diff --git a/casbin/config/config.cpp b/casbin/config/config.cpp
@@ -77,9 +77,8 @@ void Config::ParseBuffer(std::istream* buf) {
         else {
             std::vector<std::string> option_val = Split(line, "=", 2);
             if (option_val.size() != 2) {
-                char* error = new char;
-                sprintf(error, "parse the content error : line %d , %s = ? ", line_num, option_val[0].c_str());
-                throw IllegalArgumentException(std::string(error));
+                std::string error = "parse the content error : line " + std::to_string(line_num)  + " , " + option_val[0] + " = ?";
+                throw IllegalArgumentException(error);
             }
             std::string option = Trim(option_val[0]);
             std::string value = Trim(option_val[1]);

diff --git a/casbin/enforcer_cached.cpp b/casbin/enforcer_cached.cpp
@@ -108,14 +108,14 @@ CachedEnforcer::CachedEnforcer(const CachedEnforcer& ce)
     this->enableCache = ce.enableCache;
 }
 
-CachedEnforcer::CachedEnforcer(CachedEnforcer&& ce)
+CachedEnforcer::CachedEnforcer(CachedEnforcer&& ce) noexcept
     : Enforcer(ce) {
-    this->m = move(ce.m);
+    this->m = std::move(ce.m);
     this->enableCache = ce.enableCache;
 }
 
-void CachedEnforcer::EnableCache(const bool& enableCache) {
-    this->enableCache = enableCache;
+void CachedEnforcer::EnableCache(const bool& shouldEnableCache) {
+    this->enableCache = shouldEnableCache;
 }
 
 std::pair<bool, bool> CachedEnforcer::getCachedResult(const std::string& key) {

diff --git a/casbin/enforcer_synced.cpp b/casbin/enforcer_synced.cpp
@@ -139,7 +139,7 @@ void SyncedEnforcer ::SetWatcher(std::shared_ptr<Watcher> w) {
 
 // LoadModel reloads the model from the model CONF file.
 void SyncedEnforcer ::LoadModel() {
-    std::unique_lock<std::shared_mutex>(policyMutex);
+    std::unique_lock<std::shared_mutex> lock(policyMutex);
     Enforcer::LoadModel();
 }
 

diff --git a/casbin/management_api.cpp b/casbin/management_api.cpp
@@ -144,10 +144,7 @@ bool Enforcer ::AddNamedPolicy(const std::string& p_type, const std::vector<std:
         return this->addPolicy("p", p_type, str_slice);
     }
 
-    std::vector<std::string> policy;
-    for (int i = 0; i < params.size(); i++)
-        policy.push_back(params[i]);
-    return this->addPolicy("p", p_type, policy);
+    return this->addPolicy("p", p_type, params);
 }
 
 // AddNamedPolicies adds authorization rules to the current named policy.

diff --git a/casbin/persist/adapter.cpp b/casbin/persist/adapter.cpp
@@ -25,8 +25,8 @@
 namespace casbin {
 
 // LoadPolicyLine loads a text line as a policy rule to model.
-void LoadPolicyLine(std::string line, const std::shared_ptr<Model>& model) {
-    if (line == "" || line.find("#") == 0)
+void LoadPolicyLine(const std::string& line, const std::shared_ptr<Model>& model) {
+    if (line.empty() || line.find('#') == 0)
         return;
 
     std::vector<std::string> tokens = Split(line, ",", -1);

diff --git a/casbin/persist/adapter.h b/casbin/persist/adapter.h
@@ -25,7 +25,7 @@
 namespace casbin {
 
 // LoadPolicyLine loads a text line as a policy rule to model.
-void LoadPolicyLine(std::string line, const std::shared_ptr<Model>& model);
+void LoadPolicyLine(const std::string& line, const std::shared_ptr<Model>& model);
 
 /**
  * Adapter is the interface for Casbin adapters.
@@ -34,6 +34,8 @@ class Adapter {
 public:
     bool filtered;
 
+    virtual ~Adapter() = default;
+
     /**
      * LoadPolicy loads all policy rules from the storage.
      *

diff --git a/cmake/modules/Findbenchmark.cmake b/cmake/modules/Findbenchmark.cmake
@@ -16,7 +16,9 @@ include(FetchContent)
 
 FetchContent_Declare(
   benchmark
-  URL https://github.com/google/benchmark/archive/refs/tags/v1.5.5.zip
+  GIT_REPOSITORY https://github.com/google/benchmark.git
+  GIT_TAG v1.8.3
+  DOWNLOAD_EXTRACT_TIMESTAMP FALSE
 )
 
 set(BENCHMARK_ENABLE_TESTING OFF)

diff --git a/cmake/modules/Findgoogletest.cmake b/cmake/modules/Findgoogletest.cmake
@@ -17,7 +17,8 @@ include(FetchContent)
 FetchContent_Declare(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG release-1.11.0
+  GIT_TAG v1.14.0
+  DOWNLOAD_EXTRACT_TIMESTAMP FALSE
 )
 
 # For Windows: Prevent overriding the parent project's compiler/linker settings

diff --git a/cmake/modules/Findjson.cmake b/cmake/modules/Findjson.cmake
@@ -16,6 +16,11 @@ include(FetchContent)
 
 set(JSON_Install ON)
 
-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
+FetchContent_Declare(
+  json
+  GIT_REPOSITORY https://github.com/nlohmann/json.git
+  GIT_TAG v3.11.2
+  DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+)
 
 FetchContent_MakeAvailable(json)
diff --git a/cmake/modules/Findpybind11.cmake b/cmake/modules/Findpybind11.cmake
@@ -17,7 +17,8 @@ include(FetchContent)
 FetchContent_Declare(
   pybind11
   GIT_REPOSITORY https://github.com/pybind/pybind11.git
-  GIT_TAG v2.8.0
+  GIT_TAG v2.11.1
+  DOWNLOAD_EXTRACT_TIMESTAMP FALSE
 )
 
 FetchContent_MakeAvailable(pybind11)

diff --git a/include/casbin/enforcer_cached.h b/include/casbin/enforcer_cached.h
@@ -30,9 +30,9 @@ class CachedEnforcer : public Enforcer {
     std::mutex locker;
 
     CachedEnforcer(const CachedEnforcer& ce);
-    CachedEnforcer(CachedEnforcer&& ce);
+    CachedEnforcer(CachedEnforcer&& ce) noexcept;
 
-    void EnableCache(const bool& enableCache);
+    void EnableCache(const bool& shouldEnableCache);
     std::pair<bool, bool> getCachedResult(const std::string& key);
     void setCachedResult(const std::string& key, const bool& res);
     void InvalidateCache();

diff --git a/include/casbin/model/evaluator.h b/include/casbin/model/evaluator.h
@@ -97,7 +97,7 @@ class ExprtkEvaluator : public IEvaluator {
 
     float GetFloat() override;
 
-    std::string GetString();
+    std::string GetString() override;
 
     void Clean(AssertionMap& section, bool after_enforce = true) override;
 

diff --git a/include/casbin/persist/adapter.h b/include/casbin/persist/adapter.h
@@ -25,7 +25,7 @@
 namespace casbin {
 
 // LoadPolicyLine loads a text line as a policy rule to model.
-void LoadPolicyLine(std::string line, const std::shared_ptr<Model>& model);
+void LoadPolicyLine(const std::string& line, const std::shared_ptr<Model>& model);
 
 /**
  * Adapter is the interface for Casbin adapters.
@@ -34,6 +34,8 @@ class Adapter {
 public:
     bool filtered;
 
+    virtual ~Adapter() = default;
+
     /**
      * LoadPolicy loads all policy rules from the storage.
      *

diff --git a/tests/benchmarks/model_b.cpp b/tests/benchmarks/model_b.cpp
@@ -58,33 +58,30 @@ static void BenchmarkRBACModel(benchmark::State& state) {
 BENCHMARK(BenchmarkRBACModel);
 
 static void BenchmarkRBACModelSizesSmall(benchmark::State& state) {
-    // 100, 10, 1000
-    int num_roles = 100, num_resources = 10, num_users = 1000; 
+    int num_roles = 100, num_resources = 10, num_users = 1000;
 
     casbin::Enforcer e(rbac_model_path, "", false);
 
-    for (int i = 0; i < num_roles; ++i) e.AddPolicy({"group-has-a-very-long-name-" + std::to_string(i), "data-has-a-very-long-name-" + std::to_string(i % num_resources), "read"});
-
-    for (int i = 0; i < num_users; ++i) {
-        e.AddGroupingPolicy({"user-has-a-very-long-name-" + std::to_string(i), "group-has-a-very-long-name-" + std::to_string(i % num_roles)});
-    }
-
-    int num_request = 17;
-    std::vector<casbin::DataList> requests(num_request);
-
-    for (int i = 0; i < num_request; ++i) {
-        int id_user = num_users / num_request * i,
-            id_role = id_user / num_roles,
-            id_resource = id_role % num_resources;
-        if (i&2 == 0) 
-            id_resource = (id_resource + 1) % num_resources;
-
-        requests[i] = {"user-has-a-very-long-name-" + std::to_string(id_user), "data-has-a-very-long-name-" + std::to_string(id_resource), "read"};
-    }
-
-    for (auto _ : state) 
-        for (auto& req: requests) 
-            e.Enforce(req);
+    for (int i = 0; i < num_roles; ++i)
+        e.AddPolicy({
+            "group-has-a-very-long-name-" + std::to_string(i),
+            "data-has-a-very-long-name-" + std::to_string(i % num_resources),
+            "read"
+        });
+
+    for (int i = 0; i < num_users; ++i)
+        e.AddGroupingPolicy({
+            "user-has-a-very-long-name-" + std::to_string(i),
+            "group-has-a-very-long-name-" + std::to_string(i % num_roles)
+        });
+
+    int itr = 0;
+    for (auto _ : state)
+        e.Enforce({
+            "user-has-a-very-long-name-" + std::to_string(itr % num_users),
+            "data-has-a-very-long-name-" + std::to_string(itr % num_resources),
+            "read"
+        }), ++itr;
 }
 
 BENCHMARK(BenchmarkRBACModelSizesSmall);