From 4952257fe7bed30a82a76f3babc55d8651ace36b Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Mon, 5 Apr 2021 21:17:03 +0200
Subject: [PATCH] [App/IO] Gocad; Don't use extra ns qualifiers.
Code is already in the FileIO::Gocad namespace.
---
Applications/FileIO/GocadIO/Layer.cpp | 7 +++----
Applications/FileIO/GocadIO/Layer.h | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Applications/FileIO/GocadIO/Layer.cpp b/Applications/FileIO/GocadIO/Layer.cpp
index b3233392645..7ce3f6bd2a5 100644
--- a/Applications/FileIO/GocadIO/Layer.cpp
+++ b/Applications/FileIO/GocadIO/Layer.cpp
@@ -22,12 +22,11 @@ namespace Gocad
std::ostream& operator<<(std::ostream& os, Layer const& l)
{
std::copy(l.regions.begin(), l.regions.end(),
- std::ostream_iterator<Gocad::Region>(os, " "));
+ std::ostream_iterator<Region>(os, " "));
return os;
}
-Layer parseLayer(std::string const& line,
- std::vector<Gocad::Region> const& regions)
+Layer parseLayer(std::string const& line, std::vector<Region> const& regions)
{
std::istringstream iss(line);
std::istream_iterator<std::string> it(iss);
@@ -45,7 +44,7 @@ Layer parseLayer(std::string const& line,
{
auto const& region_it =
std::find_if(regions.begin(), regions.end(),
- [&](Gocad::Region const& r) { return r.name == *it; });
+ [&](Region const& r) { return r.name == *it; });
if (region_it != regions.end())
{
l.regions.push_back(*region_it);
diff --git a/Applications/FileIO/GocadIO/Layer.h b/Applications/FileIO/GocadIO/Layer.h
index 7f09ccadb4f..dc8565f9ee2 100644
--- a/Applications/FileIO/GocadIO/Layer.h
+++ b/Applications/FileIO/GocadIO/Layer.h
@@ -32,8 +32,7 @@ struct Layer final
std::ostream& operator<<(std::ostream& os, Layer const& l);
-Layer parseLayer(std::string const& line,
- std::vector<Gocad::Region> const& regions);
+Layer parseLayer(std::string const& line, std::vector<Region> const& regions);
} // end namespace Gocad
} // end namespace FileIO
--
GitLab