From 2c023a70416f6c823329ccd1033c7d42021ef0c6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 26 Sep 2017 00:59:18 +0200 Subject: [PATCH] Fixed build on gcc's not supporting zero-length arrays. --- src/db/unit_tests/dbVariableWidthPath.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/db/unit_tests/dbVariableWidthPath.cc b/src/db/unit_tests/dbVariableWidthPath.cc index b835342d2..2ef82de22 100644 --- a/src/db/unit_tests/dbVariableWidthPath.cc +++ b/src/db/unit_tests/dbVariableWidthPath.cc @@ -26,19 +26,19 @@ TEST(EmptyVP) { - db::Point pts[] = { }; - std::pair widths[] = { }; + db::Point pts[] = { db::Point (0, 0) }; // should be { }, but zero-size arrays are non-standard + std::pair widths[] = { std::make_pair (size_t (0), 0) }; // should be { }, but zero-size arrays are non-standard - db::VariableWidthPath vp (&pts[0], &pts[sizeof (pts) / sizeof (pts[0])], &widths[0], &widths[sizeof (widths) / sizeof (widths[0])]); + db::VariableWidthPath vp (&pts[0], &pts[0], &widths[0], &widths[0]); EXPECT_EQ (vp.to_poly ().to_string (), "()"); } TEST(VP1Point) { - db::Point pts[] = { db::Point (0, 0) }; - std::pair widths[] = { }; + db::Point pts[] = { db::Point (0, 0) }; // should be { }, but zero-size arrays are non-standard + std::pair widths[] = { std::make_pair (size_t (0), 0) }; - db::VariableWidthPath vp (&pts[0], &pts[sizeof (pts) / sizeof (pts[0])], &widths[0], &widths[sizeof (widths) / sizeof (widths[0])]); + db::VariableWidthPath vp (&pts[0], &pts[sizeof (pts) / sizeof (pts[0])], &widths[0], &widths[0]); EXPECT_EQ (vp.to_poly ().to_string (), "()"); }