From 5c00c780a1bca227875123e42e1abe1cae0fbb35 Mon Sep 17 00:00:00 2001
From: rahv <karsten.rink@ufz.de>
Date: Tue, 2 Jun 2015 11:21:35 +0200
Subject: [PATCH] fixing warnings
---
MeshLib/VtkOGSEnum.cpp | 2 +-
Tests/MeshLib/MeshProperties.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MeshLib/VtkOGSEnum.cpp b/MeshLib/VtkOGSEnum.cpp
index 4664175da0f..d92df57d705 100644
--- a/MeshLib/VtkOGSEnum.cpp
+++ b/MeshLib/VtkOGSEnum.cpp
@@ -92,7 +92,7 @@ int OGSToVtkCellType(CellType ogs)
return VTK_PYRAMID;
case CellType::PYRAMID13:
return VTK_QUADRATIC_PYRAMID;
- case CellType::INVALID:
+ default:
return -1;
}
}
diff --git a/Tests/MeshLib/MeshProperties.cpp b/Tests/MeshLib/MeshProperties.cpp
index c21f00d1f10..6f2e2650cd9 100644
--- a/Tests/MeshLib/MeshProperties.cpp
+++ b/Tests/MeshLib/MeshProperties.cpp
@@ -483,8 +483,8 @@ TEST_F(MeshLibProperties, AddDoublePropertiesTupleSize2)
// push some values (2 tuples) into the vector
for (std::size_t k(0); k<size; k++) {
- pv.push_back(k);
- pv.push_back(k);
+ pv.push_back(static_cast<double>(k));
+ pv.push_back(static_cast<double>(k));
}
// check the size, i.e., the number of tuples
ASSERT_EQ(size, pv.size());
--
GitLab