From 274a4b4127384c3ea35d4af44420020750222df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Franze=CC=81n?= Date: Mon, 30 Dec 2024 17:47:26 +0100 Subject: [PATCH 1/2] Add const keyword to CrossSection::Compose parameter --- include/manifold/cross_section.h | 2 +- src/cross_section/cross_section.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/manifold/cross_section.h b/include/manifold/cross_section.h index d931a6070..33b94d0a1 100644 --- a/include/manifold/cross_section.h +++ b/include/manifold/cross_section.h @@ -109,7 +109,7 @@ class CrossSection { */ ///@{ std::vector Decompose() const; - static CrossSection Compose(std::vector&); + static CrossSection Compose(const std::vector&); static CrossSection Square(const vec2 dims, bool center = false); static CrossSection Circle(double radius, int circularSegments = 0); ///@} diff --git a/src/cross_section/cross_section.cpp b/src/cross_section/cross_section.cpp index bacdfd10e..81cfc8fdf 100644 --- a/src/cross_section/cross_section.cpp +++ b/src/cross_section/cross_section.cpp @@ -446,7 +446,7 @@ CrossSection& CrossSection::operator^=(const CrossSection& Q) { * Construct a CrossSection from a vector of other CrossSections (batch * boolean union). */ -CrossSection CrossSection::Compose(std::vector& crossSections) { +CrossSection CrossSection::Compose(const std::vector& crossSections) { return BatchBoolean(crossSections, OpType::Add); } From ba69f680376435594ceaa04aab5025019a4d6ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Franze=CC=81n?= Date: Mon, 30 Dec 2024 17:58:21 +0100 Subject: [PATCH 2/2] Fix code formatting --- src/cross_section/cross_section.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cross_section/cross_section.cpp b/src/cross_section/cross_section.cpp index 81cfc8fdf..c24f63199 100644 --- a/src/cross_section/cross_section.cpp +++ b/src/cross_section/cross_section.cpp @@ -446,7 +446,8 @@ CrossSection& CrossSection::operator^=(const CrossSection& Q) { * Construct a CrossSection from a vector of other CrossSections (batch * boolean union). */ -CrossSection CrossSection::Compose(const std::vector& crossSections) { +CrossSection CrossSection::Compose( + const std::vector& crossSections) { return BatchBoolean(crossSections, OpType::Add); }