Use nested namespace

It's a mechanical change to modernize the code base
This commit is contained in:
Dennis Luxen
2022-12-11 10:10:26 +01:00
parent 152a52bc1a
commit a4aa153ba4
456 changed files with 469 additions and 2474 deletions
+1 -4
View File
@@ -5,9 +5,7 @@
#include <boost/assert.hpp>
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
BisectionGraphView::BisectionGraphView(const BisectionGraph &bisection_graph_)
@@ -52,5 +50,4 @@ const BisectionGraphView::EdgeT &BisectionGraphView::Edge(const EdgeID eid) cons
return bisection_graph.Edge(eid);
}
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -1,8 +1,6 @@
#include "partitioner/bisection_to_partition.hpp"
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
namespace
@@ -140,5 +138,4 @@ bisectionToPartition(const std::vector<BisectionID> &node_to_bisection_id,
return std::make_tuple(std::move(partitions), std::move(num_cells));
}
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -8,9 +8,7 @@
#include <set>
#include <stack>
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
namespace
@@ -309,5 +307,4 @@ bool DinicMaxFlow::Validate(const BisectionGraphView &view,
return separated && in_range_source && in_range_sink;
}
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -17,9 +17,7 @@
#include <tbb/blocked_range.h>
#include <tbb/parallel_for.h>
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
namespace
{
@@ -159,5 +157,4 @@ DinicMaxFlow::MinCut computeInertialFlowCut(const BisectionGraphView &view,
return bestMinCut(view, num_slopes, source_sink_rate, balance);
}
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -31,9 +31,7 @@
#include "util/timing_util.hpp"
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
auto getGraphBisection(const PartitionerConfig &config)
{
@@ -200,5 +198,4 @@ int Partitioner::Run(const PartitionerConfig &config)
return 0;
}
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -17,9 +17,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
RecursiveBisection::RecursiveBisection(BisectionGraph &bisection_graph_,
@@ -107,5 +105,4 @@ const std::vector<BisectionID> &RecursiveBisection::BisectionIDs() const
std::uint32_t RecursiveBisection::SCCDepth() const { return internal_state.SCCDepth(); }
} // namespace partitioner
} // namespace osrm
@@ -8,9 +8,7 @@
#include <set>
#include <unordered_map>
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
RecursiveBisectionState::RecursiveBisectionState(BisectionGraph &bisection_graph_)
@@ -181,5 +179,4 @@ const std::vector<BisectionID> &RecursiveBisectionState::BisectionIDs() const
std::uint32_t RecursiveBisectionState::SCCDepth() const { return scc_levels; }
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -2,9 +2,7 @@
#include "util/permutation.hpp"
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
namespace
{
@@ -66,5 +64,4 @@ std::vector<std::uint32_t> makePermutation(const DynamicEdgeBasedGraph &graph,
return util::orderingToPermutation(ordering);
}
} // namespace partitioner
} // namespace osrm
+1 -4
View File
@@ -1,8 +1,6 @@
#include "partitioner/tarjan_graph_wrapper.hpp"
namespace osrm
{
namespace partitioner
namespace osrm::partitioner
{
TarjanGraphWrapper::TarjanGraphWrapper(const BisectionGraph &bisection_graph_)
@@ -22,5 +20,4 @@ NodeID TarjanGraphWrapper::GetTarget(const EdgeID eid) const
return bisection_graph.Edge(eid).target;
}
} // namespace partitioner
} // namespace osrm