Merge branch 'release-boba' into masterupstream/fabian-merge-release-4.0.1-master

# Conflicts:
#	mapbox-gl-js
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/gradle/dependencies.gradle
#	platform/darwin/src/MGLVectorTileSource.mm
#	platform/darwin/src/MGLVectorTileSource_Private.h
#	platform/ios/CHANGELOG.md
#	src/mbgl/style/expression/compound_expression.cpp

1 files changed, 0 insertions, 55 deletions

diff --git a/include/mbgl/style/filter_evaluator.hpp b/include/mbgl/style/filter_evaluator.hpp
deleted file mode 100644
index a4a4098b3f..0000000000
--- a/include/mbgl/style/filter_evaluator.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-
-#include <mbgl/style/filter.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <type_traits>
-
-namespace mbgl {
-namespace style {
-
-/*
-   A visitor that evaluates a `Filter` for a given feature.
-
-   Use via `Filter::operator()`. For example:
-
-       if (filter(feature)) {
-           // matches the filter
-       } else {
-           // does not match
-       }
-*/
-class FilterEvaluator {
-public:
-    const expression::EvaluationContext context;
-
-    bool operator()(const NullFilter&) const;
-    bool operator()(const EqualsFilter& filter) const;
-    bool operator()(const NotEqualsFilter& filter) const;
-    bool operator()(const LessThanFilter& filter) const;
-    bool operator()(const LessThanEqualsFilter& filter) const;
-    bool operator()(const GreaterThanFilter& filter) const;
-    bool operator()(const GreaterThanEqualsFilter& filter) const;
-    bool operator()(const InFilter& filter) const;
-    bool operator()(const NotInFilter& filter) const;
-    bool operator()(const AnyFilter& filter) const;
-    bool operator()(const AllFilter& filter) const;
-    bool operator()(const NoneFilter& filter) const;
-    bool operator()(const HasFilter& filter) const;
-    bool operator()(const NotHasFilter& filter) const;
-    bool operator()(const TypeEqualsFilter& filter) const;
-    bool operator()(const TypeNotEqualsFilter& filter) const;
-    bool operator()(const TypeInFilter& filter) const;
-    bool operator()(const TypeNotInFilter& filter) const;
-    bool operator()(const IdentifierEqualsFilter& filter) const;
-    bool operator()(const IdentifierNotEqualsFilter& filter) const;
-    bool operator()(const IdentifierInFilter& filter) const;
-    bool operator()(const IdentifierNotInFilter& filter) const;
-    bool operator()(const HasIdentifierFilter&) const;
-    bool operator()(const NotHasIdentifierFilter&) const;
-    bool operator()(const ExpressionFilter&) const;
-
-};
-
-} // namespace style
-} // namespace mbgl