From b9394ae45a69270e0da2e5634a0d03ead634f9ec Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Tue, 7 Dec 2021 13:28:13 -0500 Subject: [PATCH] use unique_ptr (C++11) instead of make_unique (C++14) (#1844) --- src/GDSIIgeom.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/GDSIIgeom.cpp b/src/GDSIIgeom.cpp index aacd3b8eb..172965c14 100644 --- a/src/GDSIIgeom.cpp +++ b/src/GDSIIgeom.cpp @@ -170,11 +170,7 @@ geometric_object get_GDSII_prism(material_type material, const char *GDSIIFile, dVec polygon = get_polygon(GDSIIFile, Text, Layer); int num_vertices = polygon.size() / 2; -<<<<<<< HEAD std::unique_ptr vertices(new vector3[num_vertices]); -======= - auto vertices = std::make_unique(num_vertices); ->>>>>>> Fix memory leaks (#1839) for (int nv = 0; nv < num_vertices; nv++) { vertices[nv].x = polygon[2 * nv + 0]; vertices[nv].y = polygon[2 * nv + 1];