Fix compilation of library (not tests)

DataDog · Feb 4, 2025 · f43dbf0 · f43dbf0
1 parent 868cc8e
commit f43dbf0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/builder/ruleset_builder.cpp b/src/builder/ruleset_builder.cpp
@@ -20,8 +20,12 @@
 #include "exclusion/rule_filter.hpp"
 #include "indexer.hpp"
 #include "log.hpp"
+#include "matcher/base.hpp"
+#include "processor/base.hpp"
+#include "rule.hpp"
 #include "ruleset.hpp"
 #include "ruleset_builder.hpp"
+#include "scanner.hpp"
 
 namespace ddwaf {
 
@@ -124,8 +128,8 @@ std::shared_ptr<ruleset> ruleset_builder::build(
 
     if (contains(current_changes, base_rule_update | custom_rule_update)) {
         rule_index_.clear();
-        for (const auto &rule : *final_base_rules_) { rule_index_.emplace(&rule); }
-        for (const auto &rule : *final_user_rules_) { rule_index_.emplace(&rule); }
+        for (auto &rule : *final_base_rules_) { rule_index_.emplace(&rule); }
+        for (auto &rule : *final_user_rules_) { rule_index_.emplace(&rule); }
     }
 
     // Generate rule filters targetting all final rules

diff --git a/src/condition/scalar_condition.cpp b/src/condition/scalar_condition.cpp
@@ -8,7 +8,6 @@
 #include <span>
 #include <string>
 #include <string_view>
-#include <unordered_map>
 #include <utility>
 
 #include "clock.hpp"

diff --git a/src/exclusion/input_filter.cpp b/src/exclusion/input_filter.cpp
@@ -9,7 +9,6 @@
 #include <set>
 #include <stdexcept>
 #include <string>
-#include <unordered_map>
 #include <utility>
 
 #include "clock.hpp"

diff --git a/src/exclusion/rule_filter.cpp b/src/exclusion/rule_filter.cpp
@@ -8,7 +8,6 @@
 #include <set>
 #include <stdexcept>
 #include <string>
-#include <unordered_map>
 #include <utility>
 
 #include "clock.hpp"

diff --git a/src/expression.cpp b/src/expression.cpp
@@ -5,8 +5,6 @@
 // Copyright 2021 Datadog, Inc.
 
 #include <memory>
-#include <string>
-#include <unordered_map>
 
 #include "clock.hpp"
 #include "condition/base.hpp"

diff --git a/src/indexer.hpp b/src/indexer.hpp
@@ -38,8 +38,8 @@ namespace ddwaf {
 
 template <typename T> class indexer {
 public:
-    using iterator = typename std::unordered_map<std::string_view, T>::iterator;
-    using const_iterator = typename std::unordered_map<std::string_view, T>::const_iterator;
+    using iterator = typename std::unordered_map<std::string_view, T *>::iterator;
+    using const_iterator = typename std::unordered_map<std::string_view, T *>::const_iterator;
 
     void emplace(T *item)
     {