Fixed the compilation again.

ad-freiburg · Sep 29, 2021 · 1ec37f5 · 1ec37f5
1 parent e9ce6b7
commit 1ec37f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/index/Index.h b/src/index/Index.h
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <fstream>
-#include <google/sparse_hash_set>
 #include <memory>
 #include <nlohmann/json.hpp>
 #include <optional>

diff --git a/src/index/IndexMetaData.h b/src/index/IndexMetaData.h
@@ -9,7 +9,6 @@
 #include <array>
 #include <cmath>
 #include <exception>
-#include <google/sparse_hash_map>
 #include <limits>
 #include <utility>
 #include <vector>

diff --git a/src/parser/NaryExpression.h b/src/parser/NaryExpression.h
@@ -158,7 +158,7 @@ using ConditionalOrExpression = detail::MultiBinaryExpression<
 
 /// Boolean and, the name "ConditionalAndExpression" comes from the Sparql 1.1 grammar.
 inline auto andLambda = [](bool a, bool b) { return a && b; };
-using ConditionalAndExpression = detail::DispatchedBinaryExpression<
+using ConditionalAndExpression = detail::MultiBinaryExpression<
     ad_utility::Intersection, detail::EffectiveBooleanValueGetter,
     TaggedFunction<"&&", decltype(andLambda)>>;
 
@@ -184,7 +184,7 @@ inline auto divide = [](const auto& a, const auto& b) -> double {
   return static_cast<double>(a) / b;
 };
 using MultiplicativeExpression =
-    detail::DispatchedBinaryExpression<detail::NoCalculationWithSetOfIntervals,
+    detail::MultiBinaryExpression<detail::NoCalculationWithSetOfIntervals,
                                        detail::NumericValueGetter,
                                        TaggedFunction<"*", decltype(multiply)>,
                                        TaggedFunction<"/", decltype(divide)>>;
@@ -195,7 +195,7 @@ inline auto subtract = [](const auto& a, const auto& b) -> double {
   return a - b;
 };
 using AdditiveExpression =
-    detail::DispatchedBinaryExpression<detail::NoCalculationWithSetOfIntervals,
+    detail::MultiBinaryExpression<detail::NoCalculationWithSetOfIntervals,
                                        detail::NumericValueGetter,
                                        TaggedFunction<"+", decltype(add)>,
                                        TaggedFunction<"-", decltype(subtract)>>;