Merge pull request #1001 from TomFischer/Cleanups

Cleanups

Applications/Utils/MeshGeoTools/ComputeSurfaceNodeIDsInPolygonalRegion.cpp

@@ -15,11 +15,9 @@
 #include <vector>
 
 #include "tclap/CmdLine.h"
-#include "logog/include/logog.hpp"
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
 
-#include "BaseLib/LogogSimpleFormatter.h"
 #include "BaseLib/StringTools.h"
 #include "BaseLib/FileTools.h"
 
@@ -87,13 +85,13 @@ int main (int argc, char* argv[])
 	cmd.parse(argc, argv);
 
 	std::unique_ptr<MeshLib::Mesh const> mesh(FileIO::readMeshFromFile(mesh_in.getValue()));
-	INFO("Mesh read: %ul nodes, %ul elements.", mesh->getNNodes(), mesh->getNElements());
+	INFO("Mesh read: %u nodes, %u elements.", mesh->getNNodes(), mesh->getNElements());
 
 	GeoLib::GEOObjects geo_objs;
 	FileIO::readGeometryFromFile(geo_in.getValue(), geo_objs);
 	std::vector<std::string> geo_names;
 	geo_objs.getGeometryNames(geo_names);
-	INFO("Geometry \"%s\" read: %ul points, %ul polylines.",
+	INFO("Geometry \"%s\" read: %u points, %u polylines.",
 		geo_names[0].c_str(),
 		geo_objs.getPointVec(geo_names[0])->size(),
 		geo_objs.getPolylineVec(geo_names[0])->size());

Tests/MathLib/AutoCheckTools.h

@@ -44,7 +44,7 @@ struct IntervalGenerator
 		return _m * val + _n;
 	}
 
-	result_type operator()(std::size_t size = 0)
+	result_type operator()(std::size_t /*size*/ = 0)
 	{
 		return intervalMap(fix(1.0, generator)());
 	}
@@ -61,7 +61,7 @@ struct IntervalTupleGenerator
 
 	using result_type = std::array<T, 3>;
 
-	result_type operator()(std::size_t size = 0)
+	result_type operator()(std::size_t /*size*/ = 0)
 	{
 		return {{ x_gen(), y_gen(), z_gen() }};
 	}

Tests/MeshLib/TestAddLayerToMesh.cpp

@@ -28,7 +28,7 @@ namespace AddLayerValidation
 		int const reduce_tests = (testNodeOrder) ? 0 : 1;
 
 		std::size_t const nErrorFlags (static_cast<std::size_t>(ElementErrorFlag::MaxValue));
-		ElementErrorFlag const flags[nErrorFlags] = {ElementErrorFlag::ZeroVolume, 
+		ElementErrorFlag const flags[nErrorFlags] = {ElementErrorFlag::ZeroVolume,
 		ElementErrorFlag::NonCoplanar, ElementErrorFlag::NonConvex,  ElementErrorFlag::NodeOrder};
 		std::vector<ElementErrorCode> const codes (MeshLib::MeshValidation::testElementGeometry(mesh));
 		for (std::size_t i=0; i<codes.size(); ++i)
@@ -175,7 +175,6 @@ TEST(MeshLib, AddTopLayerToHexMesh)
 		MeshLib::MeshSurfaceExtraction::getMeshSurface(*result, dir, 90));
 	AddLayerValidation::testZCoords3D(*test_input, *test_output, height);
 	AddLayerValidation::validate(*result, true);
-
 }
 
 TEST(MeshLib, AddBottomLayerToHexMesh)