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
@@ -14,11 +14,7 @@
#include <limits>
#include <string>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -235,8 +231,6 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
qi::symbols<char, engine::Approach> approach_type;
qi::symbols<char, engine::api::BaseParameters::SnappingType> snapping_type;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -7,11 +7,7 @@
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -62,8 +58,6 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
qi::symbols<char, engine::api::MatchParameters::GapsType> gaps_type;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -7,11 +7,7 @@
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -40,8 +36,6 @@ struct NearestParametersGrammar final : public BaseParametersGrammar<Iterator, S
qi::rule<Iterator, Signature> root_rule;
qi::rule<Iterator, Signature> nearest_rule;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
+1 -7
View File
@@ -8,11 +8,7 @@
#include <type_traits>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
// Note: this file provides only the interface for the generic parseParameters function.
@@ -43,8 +39,6 @@ boost::optional<ParameterT> parseParameters(std::string options_string)
return parseParameters<ParameterT>(first, last);
}
} // namespace api
} // namespace server
} // namespace osrm
#endif
+1 -7
View File
@@ -6,11 +6,7 @@
#include <string>
#include <vector>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
struct ParsedURL final
@@ -22,8 +18,6 @@ struct ParsedURL final
std::size_t prefix_length;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -7,11 +7,7 @@
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -113,8 +109,6 @@ struct RouteParametersGrammar : public BaseParametersGrammar<Iterator, Signature
qi::symbols<char, engine::api::RouteParameters::OverviewType> overview_type;
qi::symbols<char, engine::api::RouteParameters::AnnotationsType> annotations_type;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -7,11 +7,7 @@
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -106,8 +102,6 @@ struct TableParametersGrammar : public BaseParametersGrammar<Iterator, Signature
fallback_coordinate_type;
qi::real_parser<double, json_policy> double_;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -11,11 +11,7 @@
#include <string>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -40,8 +36,6 @@ struct TileParametersGrammar final : boost::spirit::qi::grammar<Iterator, Signat
private:
qi::rule<Iterator, Signature> root_rule;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -7,11 +7,7 @@
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
namespace
@@ -60,8 +56,6 @@ struct TripParametersGrammar final : public RouteParametersGrammar<Iterator, Sig
qi::symbols<char, engine::api::TripParameters::SourceType> source_type;
qi::symbols<char, engine::api::TripParameters::DestinationType> destination_type;
};
} // namespace api
} // namespace server
} // namespace osrm
#endif
+1 -7
View File
@@ -7,11 +7,7 @@
#include <string>
namespace osrm
{
namespace server
{
namespace api
namespace osrm::server::api
{
// Starts parsing and iter and modifies it until iter == end or parsing failed
@@ -22,8 +18,6 @@ inline boost::optional<ParsedURL> parseURL(std::string url_string)
auto iter = url_string.begin();
return parseURL(iter, url_string.end());
}
} // namespace api
} // namespace server
} // namespace osrm
#endif