diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 19:19:04 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
| commit | 4014aa6721e53318e4ac92814776b3e01b4589cb (patch) | |
| tree | dd57dfb64f5db1a9afaf7ab94cfa9aaeaae1392b /test/style | |
| parent | 2fae373fc9da1a5ed61b5114d8c982073734826d (diff) | |
| download | qtlocation-mapboxgl-4014aa6721e53318e4ac92814776b3e01b4589cb.tar.gz | |
[core] GCC 4.9 bracket initialization issues
Diffstat (limited to 'test/style')
| -rw-r--r-- | test/style/function/source_function.test.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/style/function/source_function.test.cpp b/test/style/function/source_function.test.cpp index 260620c8d0..46ad961002 100644 --- a/test/style/function/source_function.test.cpp +++ b/test/style/function/source_function.test.cpp @@ -76,11 +76,14 @@ TEST(SourceFunction, Categorical) { EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>({{ int64_t(1), 1.0f }})) .evaluate(oneString, 0.0f)); - EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>({{ "1"s, 1.0f }})) + CategoricalStops<float>::Stops stops; + stops["1"s] = 1.0f; + + EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>(stops)) .evaluate(oneInteger, 0.0f)); - EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>({{ "1"s, 1.0f }})) + EXPECT_EQ(0.0f, SourceFunction<float>("property", CategoricalStops<float>(stops)) .evaluate(oneDouble, 0.0f)); - EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>({{ "1"s, 1.0f }})) + EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>(stops)) .evaluate(oneString, 0.0f)); EXPECT_EQ(1.0f, SourceFunction<float>("property", CategoricalStops<float>({{ true, 1.0f }})) |