From 04256a275307c729afc8b5c1463913f417d45e84 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 15 Nov 2018 22:59:38 +0100 Subject: [PATCH] WIP: fixed RecursiveShapeIterator unit tests. --- ...rsiveShapeIterator.cc => dbRecursiveShapeIteratorTests.cc} | 4 ++-- src/db/unit_tests/unit_tests.pro | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/db/unit_tests/{dbRecursiveShapeIterator.cc => dbRecursiveShapeIteratorTests.cc} (99%) diff --git a/src/db/unit_tests/dbRecursiveShapeIterator.cc b/src/db/unit_tests/dbRecursiveShapeIteratorTests.cc similarity index 99% rename from src/db/unit_tests/dbRecursiveShapeIterator.cc rename to src/db/unit_tests/dbRecursiveShapeIteratorTests.cc index dfd115c27..18d308d82 100644 --- a/src/db/unit_tests/dbRecursiveShapeIterator.cc +++ b/src/db/unit_tests/dbRecursiveShapeIteratorTests.cc @@ -715,7 +715,7 @@ class FlatPusher public: FlatPusher (std::set *boxes) : mp_boxes (boxes) { } - void shape (const db::RecursiveShapeIterator * /*iter*/, const db::Shape &shape, const db::ICplxTrans &trans) + void shape (const db::RecursiveShapeIterator * /*iter*/, const db::Shape &shape, const db::ICplxTrans &trans, const db::Box & /*region*/, const box_tree_type * /*complex_region*/) { mp_boxes->insert (trans * shape.bbox ()); } @@ -938,7 +938,7 @@ public: return true; } - virtual void shape (const db::RecursiveShapeIterator * /*iter*/, const db::Shape &shape, const db::ICplxTrans &trans) + virtual void shape (const db::RecursiveShapeIterator * /*iter*/, const db::Shape &shape, const db::ICplxTrans &trans, const db::Box & /*region*/, const box_tree_type * /*complex_region*/) { m_text += "shape(" + shape.to_string () + "," + tl::to_string (trans) + ")\n"; } diff --git a/src/db/unit_tests/unit_tests.pro b/src/db/unit_tests/unit_tests.pro index 2e3f8a0e1..07b2e6225 100644 --- a/src/db/unit_tests/unit_tests.pro +++ b/src/db/unit_tests/unit_tests.pro @@ -39,7 +39,6 @@ SOURCES = \ dbPolygon.cc \ dbPolygonTools.cc \ dbPropertiesRepository.cc \ - dbRecursiveShapeIterator.cc \ dbRegion.cc \ dbShapeArray.cc \ dbShape.cc \ @@ -54,7 +53,8 @@ SOURCES = \ dbVariableWidthPath.cc \ dbLoadLayoutOptionsTests.cc \ dbSaveLayoutOptionsTests.cc \ - dbHierarchyBuilderTests.cc + dbHierarchyBuilderTests.cc \ + dbRecursiveShapeIteratorTests.cc INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC