diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-25 16:19:07 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-28 18:02:00 +0100 |
| commit | 4fe071b518e792fdf069eb81ac326cf0f27f5e73 (patch) | |
| tree | 692a820f2f93efa60f3cec07e2c2af35845fd6bc /test/style/filter.test.cpp | |
| parent | 11281d15e9c36b82dda3361c518161fb11c13ef9 (diff) | |
| download | qtlocation-mapboxgl-4fe071b518e792fdf069eb81ac326cf0f27f5e73.tar.gz | |
[build] upgrade to variant 1.1.4 and dependencies
Diffstat (limited to 'test/style/filter.test.cpp')
| -rw-r--r-- | test/style/filter.test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/style/filter.test.cpp b/test/style/filter.test.cpp index b49f424a39..33b64978f5 100644 --- a/test/style/filter.test.cpp +++ b/test/style/filter.test.cpp @@ -42,7 +42,7 @@ TEST(Filter, EqualsNumber) { ASSERT_FALSE(f(feature({{ "foo", std::string("0") }}))); ASSERT_FALSE(f(feature({{ "foo", false }}))); ASSERT_FALSE(f(feature({{ "foo", true }}))); - ASSERT_FALSE(f(feature({{ "foo", nullptr }}))); + ASSERT_FALSE(f(feature({{ "foo", mapbox::geometry::null_value }}))); ASSERT_FALSE(f(feature({{}}))); } @@ -113,13 +113,13 @@ TEST(Filter, NotHas) { TEST(Filter, ID) { Feature feature1 { Point<double>() }; - feature1.id = { 1234 }; + feature1.id = { uint64_t(1234) }; ASSERT_TRUE(parse("[\"==\", \"$id\", 1234]")(feature1)); ASSERT_FALSE(parse("[\"==\", \"$id\", \"1234\"]")(feature1)); Feature feature2 { Point<double>() }; - feature2.properties["id"] = { 1234 }; + feature2.properties["id"] = { uint64_t(1234) }; ASSERT_FALSE(parse("[\"==\", \"$id\", 1234]")(feature2)); } |