From 9c63bc785b794ad09a0afd4c852cd342cf2baf9f Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Tue, 12 Aug 2014 11:18:39 +0200
Subject: [PATCH] Compilation error on Juelich gcc 4.1.2.
---
Tests/UnitTests/TestCore/FixedBinAxisTest.h | 2 +-
.../UnitTests/TestCore/IntensityDataFunctionsTest.h | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Tests/UnitTests/TestCore/FixedBinAxisTest.h b/Tests/UnitTests/TestCore/FixedBinAxisTest.h
index a578c369b08..d9e413c8bfc 100644
--- a/Tests/UnitTests/TestCore/FixedBinAxisTest.h
+++ b/Tests/UnitTests/TestCore/FixedBinAxisTest.h
@@ -164,7 +164,7 @@ TEST_F(FixedBinAxisTest, ClippedAxis)
delete clip1;
FixedBinAxis *clip2 = axis.createClippedAxis(0.0, 1.99);
- EXPECT_EQ(clip2->getSize(), 2);
+ EXPECT_EQ(clip2->getSize(), size_t(2));
EXPECT_EQ(clip2->getMin(), 0.0);
EXPECT_EQ(clip2->getMax(), 2.0);
EXPECT_TRUE(*clip2 != axis);
diff --git a/Tests/UnitTests/TestCore/IntensityDataFunctionsTest.h b/Tests/UnitTests/TestCore/IntensityDataFunctionsTest.h
index 74f12882684..a9a2472d59d 100644
--- a/Tests/UnitTests/TestCore/IntensityDataFunctionsTest.h
+++ b/Tests/UnitTests/TestCore/IntensityDataFunctionsTest.h
@@ -20,8 +20,10 @@ class IntensityDataFunctionsTest : public ::testing::Test
TEST_F(IntensityDataFunctionsTest, ClipDataSetFixed)
{
OutputData<double> data;
- data.addAxis(FixedBinAxis("axis0",10, -5.0, 5.0));
- data.addAxis(FixedBinAxis("axis1",3, 0.0, 3.0));
+ FixedBinAxis axis0("axis0",10, -5.0, 5.0);
+ data.addAxis(axis0);
+ FixedBinAxis axis1("axis1",3, 0.0, 3.0);
+ data.addAxis(axis1);
for(size_t i=0; i<data.getAllocatedSize(); ++i) {
data[i] = i;
@@ -44,8 +46,10 @@ TEST_F(IntensityDataFunctionsTest, ClipDataSetVariable)
std::vector<double> values (arr, arr + sizeof(arr) / sizeof(arr[0]) );
OutputData<double> data;
- data.addAxis(VariableBinAxis("axis0",4, values));
- data.addAxis(VariableBinAxis("axis1",4, values));
+ VariableBinAxis axis0("axis0",4, values);
+ data.addAxis(axis0);
+ VariableBinAxis axis1("axis1",4, values);
+ data.addAxis(axis1);
for(size_t i=0; i<data.getAllocatedSize(); ++i) {
data[i] = i;
--
GitLab