From cc6f61b746b6f2f3fbd4c71efd08a0d0190f4551 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Sun, 25 Mar 2018 16:22:04 +0200
Subject: [PATCH] fix tests to run with sa-no-te branch
---
Tests/Surfaces/SurfaceArrayTests.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Tests/Surfaces/SurfaceArrayTests.cpp b/Tests/Surfaces/SurfaceArrayTests.cpp
index 076105831..09f21c80d 100644
--- a/Tests/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/Surfaces/SurfaceArrayTests.cpp
@@ -291,12 +291,12 @@ namespace Test {
R * std::sin(loc[0] - angleShift),
loc[1]);
};
- SurfaceArray::SurfaceGridLookup<decltype(phiAxis), decltype(zAxis)> sl(
+ auto sl = std::make_unique<SurfaceArray::SurfaceGridLookup<decltype(phiAxis), decltype(zAxis)>>(
transform,
itransform,
std::make_tuple(std::move(phiAxis), std::move(zAxis)));
- sl.fill(brl);
- SurfaceArray sa(sl, brl);
+ sl->fill(brl);
+ SurfaceArray sa(std::move(sl), brl);
sa.dump(std::cout);
variant_data data = sa.toVariantData();
@@ -353,13 +353,13 @@ namespace Test {
auto itransform = [](const std::array<double, 1>& loc) {
return Vector3D(0, 0, loc[0]);
};
- SurfaceArray::SurfaceGridLookup<decltype(zAxis)> sl(
+ auto sl = std::make_unique<SurfaceArray::SurfaceGridLookup<decltype(zAxis)>>(
transform, itransform, std::make_tuple(zAxis));
// same thing in 1D
SrfVec line = straightLineSurfaces();
- sl.fill(line);
- SurfaceArray sa(sl, line);
+ sl->fill(line);
+ SurfaceArray sa(std::move(sl), line);
sa.dump(std::cout);
--
GitLab