From 35f0a8b9dcf285c8b2a68b8cccab8e1abbc53586 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 4 Apr 2014 11:10:54 +0200
Subject: [PATCH] Remov more warnings when g++ is used
---
FileIO/RapidXmlIO/RapidVtuInterface.cpp | 6 +++---
FileIO/XmlIO/Boost/BoostVtuInterface.cpp | 3 ++-
MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp | 3 ---
MeshLib/MeshGenerators/MeshGenerator.cpp | 4 ++--
Tests/MeshLib/TestTriLineMesh.cpp | 2 ++
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/FileIO/RapidXmlIO/RapidVtuInterface.cpp b/FileIO/RapidXmlIO/RapidVtuInterface.cpp
index 18ec76cae31..a4c472cb31a 100644
--- a/FileIO/RapidXmlIO/RapidVtuInterface.cpp
+++ b/FileIO/RapidXmlIO/RapidVtuInterface.cpp
@@ -72,14 +72,14 @@ MeshLib::Mesh* RapidVtuInterface::readVTUFile(const std::string &file_name)
rapidxml::xml_node<>* root_node (doc.first_node());
if (isVTKUnstructuredGrid(root_node))
{
- bool is_compressed(false);
+ // bool is_compressed = (false); // this variable is not used only be set once below
//check if content is compressed
const rapidxml::xml_attribute<>* compressor (root_node->first_attribute("compressor"));
if (compressor )
{
if (std::string(compressor->value()).compare("vtkZLibDataCompressor") == 0)
{
- is_compressed = true;
+ //is_compressed = true; // is not used hereafter
uncompressData(root_node);
}
else
@@ -323,7 +323,7 @@ unsigned char* RapidVtuInterface::uncompressData(const rapidxml::xml_node<>* nod
if (data_node)
compressed_data = data_node->value();
- return NULL;
+ return NULL; // Does here return compressed_data?
}
diff --git a/FileIO/XmlIO/Boost/BoostVtuInterface.cpp b/FileIO/XmlIO/Boost/BoostVtuInterface.cpp
index 1d76a8c8073..0334ec9d6ff 100644
--- a/FileIO/XmlIO/Boost/BoostVtuInterface.cpp
+++ b/FileIO/XmlIO/Boost/BoostVtuInterface.cpp
@@ -362,7 +362,8 @@ unsigned char* BoostVtuInterface::uncompressData(property_tree::ptree const& com
unsigned long compressed_size = strlen(compressed_data_node.data().c_str());
unsigned char* uncompressed_data = NULL;
unsigned long uncompressed_size = 0;
- unsigned long result = zLibDataCompressor::UncompressBuffer(compressed_data, compressed_size, uncompressed_data, uncompressed_size);
+ // unsigned long result =
+ zLibDataCompressor::UncompressBuffer(compressed_data, compressed_size, uncompressed_data, uncompressed_size);
return uncompressed_data;
}
diff --git a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
index ebe7d9072a1..c0f3b735b1d 100644
--- a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
+++ b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
@@ -18,7 +18,6 @@
namespace MathLib {
-static
bool generateDiagPrecond (unsigned n, unsigned const*const iA, unsigned const*const jA,
double const*const A, double* diag)
{
@@ -45,7 +44,6 @@ bool generateDiagPrecond (unsigned n, unsigned const*const iA, unsigned const*co
return true;
}
-static
bool generateDiagPrecondRowSum(unsigned n, unsigned const*const iA, double const*const A, double* diag)
{
unsigned idx; // first idx of next row
@@ -66,7 +64,6 @@ bool generateDiagPrecondRowSum(unsigned n, unsigned const*const iA, double const
return true;
}
-static
bool generateDiagPrecondRowMax(unsigned n, unsigned const*const iA, double const*const A, double* diag)
{
unsigned idx; // first idx of next row
diff --git a/MeshLib/MeshGenerators/MeshGenerator.cpp b/MeshLib/MeshGenerators/MeshGenerator.cpp
index 5a9e51976f8..32eb005b827 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, node_id = 0; i < n_y_nodes; i++)
+ for (std::size_t i = 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, node_id = 0; i < n_z_nodes; i++)
+ for (std::size_t i = 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 ce9997241e6..910315cb8b4 100644
--- a/Tests/MeshLib/TestTriLineMesh.cpp
+++ b/Tests/MeshLib/TestTriLineMesh.cpp
@@ -77,6 +77,8 @@ 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