Merge pull request ufz#1032 from rinkk/fixes20160209

fixed warnings + memleak
rinkk · Feb 12, 2016 · 6c8009b · 6c8009b
2 parents 21d674c + b80f76a
commit 6c8009b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Tests/MathLib/AutoCheckTools.h b/Tests/MathLib/AutoCheckTools.h
@@ -46,7 +46,7 @@ struct IntervalGenerator
 
 	result_type operator()(std::size_t /*size*/ = 0)
 	{
-		return intervalMap(fix(1.0, generator)());
+		return intervalMap(fix(1, generator)());
 	}
 };
 

diff --git a/Tests/MeshLib/TestAddLayerToMesh.cpp b/Tests/MeshLib/TestAddLayerToMesh.cpp
@@ -104,7 +104,7 @@ TEST(MeshLib, AddTopLayerToTriMesh)
 	if (test)
 	{
 		test->resize(mesh->getNElements());
-		std::fill_n(mats->begin(), mesh->getNElements(), 0.1);
+		std::fill_n(test->begin(), mesh->getNElements(), 0.1);
 	}
 	ASSERT_EQ(2, mesh->getProperties().getPropertyVectorNames().size());
 	double const height (1);

diff --git a/Tests/MeshLib/TestFlipElements.cpp b/Tests/MeshLib/TestFlipElements.cpp
@@ -84,6 +84,8 @@ TEST(MeshLib, FlipHexMesh)
 		nodes.push_back(new MeshLib::Node(*mesh->getNode(i)));
 	std::unique_ptr<MeshLib::Element> elem (MeshLib::createFlippedElement(*mesh->getElement(0), nodes));
 	ASSERT_EQ(nullptr, elem);
+	for (MeshLib::Node* n : nodes)
+		delete n;
 }
 
 TEST(MeshLib, DoubleFlipQuadMesh)
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ struct IntervalGenerator @@
     	result_type operator()(std::size_t /*size*/ = 0)
     	{
-    		return intervalMap(fix(1.0, generator)());
+    		return intervalMap(fix(1, generator)());
     	}
     };
@@ Expand Down @@