diff options
author | Anand Thakker <anandthakker@users.noreply.github.com> | 2018-08-02 13:48:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 13:48:47 -0400 |
commit | d25e1a1e7f313efd78aa76c76e4fed5f4d792d8a (patch) | |
tree | fb3e191cf79c09e14e3bf41e1d3212a74175f985 /src/mbgl/style/expression/compound_expression.cpp | |
parent | 952c4131e6a46fd0fab2208379dc340fb02924e3 (diff) | |
download | qtlocation-mapboxgl-d25e1a1e7f313efd78aa76c76e4fed5f4d792d8a.tar.gz |
Relax typing for comparison operators (#12537)
* Relax typing for comparison operators
Ports https://github.com/mapbox/mapbox-gl-js/pull/6961
* Review comments
* Lint fixes
Diffstat (limited to 'src/mbgl/style/expression/compound_expression.cpp')
-rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index bbb57e19ab..53ce91f0b7 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -485,19 +485,6 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali define("ceil", [](double x) -> Result<double> { return std::ceil(x); }); define("abs", [](double x) -> Result<double> { return std::abs(x); }); - define(">", [](double lhs, double rhs) -> Result<bool> { return lhs > rhs; }); - define(">", [](const std::string& lhs, const std::string& rhs) -> Result<bool> { return lhs > rhs; }); - define(">", [](const std::string& lhs, const std::string& rhs, const Collator& c) -> Result<bool> { return c.compare(lhs, rhs) > 0; }); - define(">=", [](double lhs, double rhs) -> Result<bool> { return lhs >= rhs; }); - define(">=",[](const std::string& lhs, const std::string& rhs) -> Result<bool> { return lhs >= rhs; }); - define(">=", [](const std::string& lhs, const std::string& rhs, const Collator& c) -> Result<bool> { return c.compare(lhs, rhs) >= 0; }); - define("<", [](double lhs, double rhs) -> Result<bool> { return lhs < rhs; }); - define("<", [](const std::string& lhs, const std::string& rhs) -> Result<bool> { return lhs < rhs; }); - define("<", [](const std::string& lhs, const std::string& rhs, const Collator& c) -> Result<bool> { return c.compare(lhs, rhs) < 0; }); - define("<=", [](double lhs, double rhs) -> Result<bool> { return lhs <= rhs; }); - define("<=", [](const std::string& lhs, const std::string& rhs) -> Result<bool> { return lhs <= rhs; }); - define("<=", [](const std::string& lhs, const std::string& rhs, const Collator& c) -> Result<bool> { return c.compare(lhs, rhs) <= 0; }); - define("!", [](bool e) -> Result<bool> { return !e; }); define("is-supported-script", [](const std::string& x) -> Result<bool> { |