From a1cf19d11db08a0103826c5c91c9898f97dd4162 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 4 Apr 2014 12:11:19 +0200
Subject: [PATCH] recovery two files that are corrected in one PR by Tom
---
MeshLib/MeshGenerators/MeshGenerator.cpp | 4 ++--
Tests/MeshLib/TestTriLineMesh.cpp | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/MeshLib/MeshGenerators/MeshGenerator.cpp b/MeshLib/MeshGenerators/MeshGenerator.cpp
index 32eb005b827..5a9e51976f8 100644
--- a/MeshLib/MeshGenerators/MeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/MeshGenerator.cpp
@@ -79,7 +79,7 @@ Mesh* MeshGenerator::generateRegularQuadMesh(const unsigned n_x_cells,
std::vector<Node*> nodes;
nodes.reserve(n_x_nodes * n_y_nodes);
- for (std::size_t i = 0; i < n_y_nodes; i++)
+ for (std::size_t i = 0, node_id = 0; i < n_y_nodes; i++)
{
const double y_offset (origin[1] + cell_size * i);
for (std::size_t j = 0; j < n_x_nodes; j++)
@@ -130,7 +130,7 @@ Mesh* MeshGenerator::generateRegularHexMesh(const unsigned n_x_cells,
std::vector<Node*> nodes;
nodes.reserve(n_x_nodes * n_y_nodes * n_z_nodes);
- for (std::size_t i = 0; i < n_z_nodes; i++)
+ for (std::size_t i = 0, node_id = 0; i < n_z_nodes; i++)
{
const double z_offset (origin[2] + cell_size * i);
for (std::size_t j = 0; j < n_y_nodes; j++)
diff --git a/Tests/MeshLib/TestTriLineMesh.cpp b/Tests/MeshLib/TestTriLineMesh.cpp
index 910315cb8b4..ce9997241e6 100644
--- a/Tests/MeshLib/TestTriLineMesh.cpp
+++ b/Tests/MeshLib/TestTriLineMesh.cpp
@@ -77,8 +77,6 @@ class MeshLibTriLineMesh : public ::testing::Test
bool
elementIsNeigborOf(std::size_t const a, std::size_t const b) const
{
- (void)a; // Avoid GCC warning
- (void)b;
return false;
}
};
--
GitLab