From 997b44a2cf0b6d21a57c47d8f6b6c13f296b523f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 26 Oct 2012 10:45:04 +0200
Subject: [PATCH] Removed last occurrence of namespace BASELIB.
---
BaseLib/Histogram.h | 4 ++--
Gui/VtkVis/VtkVisPipeline.cpp | 2 +-
MeshLib/MeshQuality/MeshQualityChecker.cpp | 4 ++--
MeshLib/MeshQuality/MeshQualityChecker.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/BaseLib/Histogram.h b/BaseLib/Histogram.h
index 8ae04be9d18..9c889c69118 100644
--- a/BaseLib/Histogram.h
+++ b/BaseLib/Histogram.h
@@ -14,7 +14,7 @@
#include <ostream>
#include <vector>
-namespace BASELIB
+namespace BaseLib
{
/** Basic Histogram implementation.
@@ -159,6 +159,6 @@ operator<<(std::ostream& os, const Histogram<T>& h)
return os << std::endl;
}
-} // namespace BASELIB
+} // namespace BaseLib
#endif // BASELIB_HISTOGRAM_H
diff --git a/Gui/VtkVis/VtkVisPipeline.cpp b/Gui/VtkVis/VtkVisPipeline.cpp
index c3b0819353f..e9a42d86e58 100644
--- a/Gui/VtkVis/VtkVisPipeline.cpp
+++ b/Gui/VtkVis/VtkVisPipeline.cpp
@@ -526,7 +526,7 @@ void VtkVisPipeline::checkMeshQuality(VtkMeshSource* source, MshQualityType::typ
// size_t size (static_cast<size_t>(QInputDialog::getInt(NULL, "OGS-Histogram", "number of histogram classes/spins (min: 1, max: 10000)", static_cast<int>(nclasses), 1, 10000, 1, &ok)));
// if (ok) ...
- BASELIB::Histogram<double> histogram (checker->getHistogram(nclasses));
+ BaseLib::Histogram<double> histogram (checker->getHistogram(nclasses));
std::ofstream out ("mesh_histogram.txt");
if (out) {
out << "# histogram depicts mesh quality criterion " << MshQualityType2String(t)
diff --git a/MeshLib/MeshQuality/MeshQualityChecker.cpp b/MeshLib/MeshQuality/MeshQualityChecker.cpp
index 2c6c88694da..83fad02943f 100644
--- a/MeshLib/MeshQuality/MeshQualityChecker.cpp
+++ b/MeshLib/MeshQuality/MeshQualityChecker.cpp
@@ -24,14 +24,14 @@ MeshQualityChecker::MeshQualityChecker(Mesh const* const mesh) :
_mesh_quality_measure.resize (_mesh->getNElements(), -1.0);
}
-BASELIB::Histogram<double> MeshQualityChecker::getHistogram (size_t nclasses) const
+BaseLib::Histogram<double> MeshQualityChecker::getHistogram (size_t nclasses) const
{
if (nclasses == 0) {
// simple suggestion: number of classes with Sturges criterion
nclasses = static_cast<size_t>(1 + 3.3 * log (static_cast<float>((_mesh->getNElements()))));
}
- return BASELIB::Histogram<double>(getMeshQuality(), nclasses, true);
+ return BaseLib::Histogram<double>(getMeshQuality(), nclasses, true);
}
void MeshQualityChecker::errorMsg (const Element* elem, size_t idx) const
diff --git a/MeshLib/MeshQuality/MeshQualityChecker.h b/MeshLib/MeshQuality/MeshQualityChecker.h
index 66e9c0dce28..e4cbcaa27ec 100644
--- a/MeshLib/MeshQuality/MeshQualityChecker.h
+++ b/MeshLib/MeshQuality/MeshQualityChecker.h
@@ -36,7 +36,7 @@ public:
std::vector<double> const& getMeshQuality () const;
double getMinValue() const;
double getMaxValue() const;
- virtual BASELIB::Histogram<double> getHistogram (std::size_t nclasses = 0) const;
+ virtual BaseLib::Histogram<double> getHistogram (std::size_t nclasses = 0) const;
protected:
void errorMsg (const Element* elem, std::size_t idx) const;
--
GitLab