diff options
| author | Anand Thakker <github@anandthakker.net> | 2017-11-03 16:05:08 -0400 |
|---|---|---|
| committer | Anand Thakker <github@anandthakker.net> | 2017-11-03 16:05:08 -0400 |
| commit | 9f198bd4bed6cc5379d102083d8564d478fdc541 (patch) | |
| tree | dc078058c40e589bc5406fdf07c7fa933bfadf0e | |
| parent | ac86e41f95b7578eb3135b17f15358e27b97e7b2 (diff) | |
| download | qtlocation-mapboxgl-9f198bd4bed6cc5379d102083d8564d478fdc541.tar.gz | |
Fix == check for {Source,Camera,Composite}Function
| -rw-r--r-- | include/mbgl/style/function/camera_function.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/function/composite_function.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/style/function/source_function.hpp | 3 | ||||
| m--------- | mapbox-gl-js | 0 |
4 files changed, 3 insertions, 5 deletions
diff --git a/include/mbgl/style/function/camera_function.hpp b/include/mbgl/style/function/camera_function.hpp index 721d3083e1..1394c5eb8d 100644 --- a/include/mbgl/style/function/camera_function.hpp +++ b/include/mbgl/style/function/camera_function.hpp @@ -71,7 +71,7 @@ public: friend bool operator==(const CameraFunction& lhs, const CameraFunction& rhs) { - return lhs.stops == rhs.stops; + return lhs.expression == rhs.expression; } bool useIntegerZoom = false; diff --git a/include/mbgl/style/function/composite_function.hpp b/include/mbgl/style/function/composite_function.hpp index 5c91f1d6c9..ad9c2e83de 100644 --- a/include/mbgl/style/function/composite_function.hpp +++ b/include/mbgl/style/function/composite_function.hpp @@ -106,8 +106,7 @@ public: friend bool operator==(const CompositeFunction& lhs, const CompositeFunction& rhs) { - return std::tie(lhs.property, lhs.stops, lhs.defaultValue) - == std::tie(rhs.property, rhs.stops, rhs.defaultValue); + return lhs.expression == rhs.expression; } std::string property; diff --git a/include/mbgl/style/function/source_function.hpp b/include/mbgl/style/function/source_function.hpp index 40e0de737e..bdef9633b7 100644 --- a/include/mbgl/style/function/source_function.hpp +++ b/include/mbgl/style/function/source_function.hpp @@ -59,8 +59,7 @@ public: friend bool operator==(const SourceFunction& lhs, const SourceFunction& rhs) { - return std::tie(lhs.property, lhs.stops, lhs.defaultValue) - == std::tie(rhs.property, rhs.stops, rhs.defaultValue); + return lhs.expression == rhs.expression; } bool useIntegerZoom = false; diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject 575e42d332fa26b9f7574047e3c67a44bf5ca87 +Subproject bb0e8749598fe6b69c85db70c24fa39f0b1e0c6 |