From 8c4fa25c8d65e75978c0a82bc6391906595ff190 Mon Sep 17 00:00:00 2001 From: artemp Date: Tue, 7 Mar 2017 13:34:43 +0100 Subject: [PATCH] attempt to fix "error: chosen constructor is explicit in copy-initialization" error with gcc --- test/unit/text/shaping.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/text/shaping.cpp b/test/unit/text/shaping.cpp index 4dd8ff885..e7b93c350 100644 --- a/test/unit/text/shaping.cpp +++ b/test/unit/text/shaping.cpp @@ -66,7 +66,7 @@ TEST_CASE("shaping") { auto const& expected = - {std::tuple{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}}; + {std::tuple(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}}; // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^ //std::vector> expected = // {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}}; @@ -76,19 +76,19 @@ TEST_CASE("shaping") { auto const& expected = - {std::tuple{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}}; + {std::tuple(0, 0), {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}}; test_shaping(fontset, fm, expected, u8"སྤུ་ཧྲེང (普兰镇)"); } { auto const& expected = - {std::tuple{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}}; + {std::tuple(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {0, 5}, {0, 6}, {0, 7}, {12, 8}}; test_shaping(fontset, fm, expected, u8"abc (普兰镇)"); } { auto const& expected = - {std::tuple{68, 0}, {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}}; + {std::tuple(68, 0), {69, 1}, {70, 2}, {3, 3}, {11, 4}, {68, 5}, {69, 6}, {70, 7}, {12, 8}}; test_shaping(fontset, fm, expected, "abc (abc)"); }