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
@@ -21,9 +21,7 @@
#include <stdexcept>
#include <vector>
namespace osrm
{
namespace updater
namespace osrm::updater
{
// Functor to parse a list of CSV files using "key,value,comment" grammar.
@@ -138,7 +136,6 @@ template <typename Key, typename Value> struct CSVFilesParser
const KeyRule key_rule;
const ValueRule value_rule;
};
} // namespace updater
} // namespace osrm
#endif
+1 -7
View File
@@ -3,16 +3,10 @@
#include "updater/source.hpp"
namespace osrm
{
namespace updater
{
namespace csv
namespace osrm::updater::csv
{
SegmentLookupTable readSegmentValues(const std::vector<std::string> &paths);
TurnLookupTable readTurnValues(const std::vector<std::string> &paths);
} // namespace csv
} // namespace updater
} // namespace osrm
#endif
+1 -4
View File
@@ -7,9 +7,7 @@
#include <vector>
namespace osrm
{
namespace updater
namespace osrm::updater
{
template <typename Key, typename Value> struct LookupTable
@@ -88,7 +86,6 @@ struct PenaltySource final
using SegmentLookupTable = LookupTable<Segment, SpeedSource>;
using TurnLookupTable = LookupTable<Turn, PenaltySource>;
} // namespace updater
} // namespace osrm
#endif
+1 -4
View File
@@ -8,9 +8,7 @@
#include <chrono>
#include <vector>
namespace osrm
{
namespace updater
namespace osrm::updater
{
class Updater
{
@@ -37,7 +35,6 @@ class Updater
private:
UpdaterConfig config;
};
} // namespace updater
} // namespace osrm
#endif
+1 -4
View File
@@ -36,9 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "storage/io_config.hpp"
#include "storage/storage_config.hpp"
namespace osrm
{
namespace updater
namespace osrm::updater
{
struct UpdaterConfig final : storage::IOConfig
@@ -73,7 +71,6 @@ struct UpdaterConfig final : storage::IOConfig
std::vector<std::string> turn_penalty_lookup_paths;
std::string tz_file_path;
};
} // namespace updater
} // namespace osrm
#endif // EXTRACTOR_OPTIONS_HPP