From 751d6dcb56e9a81e9878a5d49c0b95f86b5b69c1 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Mon, 19 Jan 2015 14:40:51 +0100
Subject: [PATCH] [T] Fix clang compile warnings.
---
Tests/GeoLib/TestBoundingSphere.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Tests/GeoLib/TestBoundingSphere.cpp b/Tests/GeoLib/TestBoundingSphere.cpp
index a0257deda71..76341d05852 100644
--- a/Tests/GeoLib/TestBoundingSphere.cpp
+++ b/Tests/GeoLib/TestBoundingSphere.cpp
@@ -20,10 +20,10 @@
TEST(GeoLib, TestBoundingSphere)
{
std::vector<MathLib::MathPoint*> pnts;
- pnts.push_back(new MathLib::MathPoint({0, 0 , 0}));
- pnts.push_back(new MathLib::MathPoint({2, 0 , 0}));
- pnts.push_back(new MathLib::MathPoint({1, 0.1 , 0}));
- pnts.push_back(new MathLib::MathPoint({1, -0.1 , 0}));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{0, 0 , 0}})));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{2, 0 , 0}})));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{1, 0.1 , 0}})));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{1, -0.1 , 0}})));
{
/**
@@ -66,10 +66,6 @@ TEST(GeoLib, TestBoundingSphere)
ASSERT_NEAR(1.0580, s.getRadius(), 0.0001);
}
- pnts.push_back(new MathLib::MathPoint({0, 0, 1}));
- pnts.push_back(new MathLib::MathPoint({1, 0, 1}));
- pnts.push_back(new MathLib::MathPoint({1, 1, 1}));
- pnts.push_back(new MathLib::MathPoint({0, 1, 0.9}));
(*pnts[0])[0] = 0.0;
(*pnts[0])[1] = 0.0;
(*pnts[0])[2] = 0.0;
@@ -82,6 +78,10 @@ TEST(GeoLib, TestBoundingSphere)
(*pnts[3])[0] = 0.0;
(*pnts[3])[1] = 1.0;
(*pnts[3])[2] = 0.0;
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{0, 0, 1}})));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{1, 0, 1}})));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{1, 1, 1}})));
+ pnts.push_back(new MathLib::MathPoint(std::array<double,3>({{0, 1, 0.9}})));
{
/**
--
GitLab