Upgrade formatting to clang-format 10 (#5895)

* Update formatting tools to clang-format-10

* Reformat using clang-format-10.0.09
This commit is contained in:
Daniel Patterson
2020-11-26 07:21:39 -08:00
committed by GitHub
parent a3f1c2afb0
commit 50d9632ed7
373 changed files with 1198 additions and 1163 deletions
@@ -18,7 +18,7 @@ namespace
{
namespace ph = boost::phoenix;
namespace qi = boost::spirit::qi;
}
} // namespace
template <typename Iterator = std::string::iterator,
typename Signature = void(engine::api::MatchParameters &)>
@@ -62,8 +62,8 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
qi::symbols<char, engine::api::MatchParameters::GapsType> gaps_type;
};
}
}
}
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -18,7 +18,7 @@ namespace
{
namespace ph = boost::phoenix;
namespace qi = boost::spirit::qi;
}
} // namespace
template <typename Iterator = std::string::iterator,
typename Signature = void(engine::api::NearestParameters &)>
@@ -40,8 +40,8 @@ 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
+4 -4
View File
@@ -25,7 +25,7 @@ using is_parameter_t =
std::integral_constant<bool,
std::is_base_of<engine::api::BaseParameters, T>::value ||
std::is_same<engine::api::TileParameters, T>::value>;
} // ns detail
} // namespace detail
// Starts parsing and iter and modifies it until iter == end or parsing failed
template <typename ParameterT,
@@ -43,8 +43,8 @@ boost::optional<ParameterT> parseParameters(std::string options_string)
return parseParameters<ParameterT>(first, last);
}
} // ns api
} // ns server
} // ns osrm
} // namespace api
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -22,8 +22,8 @@ struct ParsedURL final
std::size_t prefix_length;
};
} // api
} // server
} // osrm
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -18,7 +18,7 @@ namespace
{
namespace ph = boost::phoenix;
namespace qi = boost::spirit::qi;
}
} // namespace
template <typename Iterator = std::string::iterator,
typename Signature = void(engine::api::RouteParameters &)>
@@ -113,8 +113,8 @@ 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
@@ -18,7 +18,7 @@ namespace
{
namespace ph = boost::phoenix;
namespace qi = boost::spirit::qi;
}
} // namespace
template <typename Iterator = std::string::iterator,
typename Signature = void(engine::api::TableParameters &)>
@@ -106,8 +106,8 @@ struct TableParametersGrammar : public BaseParametersGrammar<Iterator, Signature
fallback_coordinate_type;
qi::real_parser<double, json_policy> double_;
};
}
}
}
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -22,7 +22,7 @@ namespace
{
namespace ph = boost::phoenix;
namespace qi = boost::spirit::qi;
}
} // namespace
template <typename Iterator = std::string::iterator,
typename Signature = void(engine::api::TileParameters &)>
@@ -40,8 +40,8 @@ struct TileParametersGrammar final : boost::spirit::qi::grammar<Iterator, Signat
private:
qi::rule<Iterator, Signature> root_rule;
};
}
}
}
} // namespace api
} // namespace server
} // namespace osrm
#endif
@@ -18,7 +18,7 @@ namespace
{
namespace ph = boost::phoenix;
namespace qi = boost::spirit::qi;
}
} // namespace
template <typename Iterator = std::string::iterator,
typename Signature = void(engine::api::TripParameters &)>
@@ -60,8 +60,8 @@ 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
+3 -3
View File
@@ -22,8 +22,8 @@ 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
+2 -2
View File
@@ -76,7 +76,7 @@ class Connection : public std::enable_shared_from_this<Connection>
short processed_requests = 512;
short keepalive_timeout = 5; // In seconds
};
}
}
} // namespace server
} // namespace osrm
#endif // CONNECTION_HPP
+2 -2
View File
@@ -15,7 +15,7 @@ enum compression_type
deflate_rfc1951
};
}
}
}
} // namespace server
} // namespace osrm
#endif // COMPRESSION_TYPE_HPP
+3 -3
View File
@@ -27,8 +27,8 @@ struct header
std::string name;
std::string value;
};
}
}
}
} // namespace http
} // namespace server
} // namespace osrm
#endif // HEADER_HPP
+3 -3
View File
@@ -38,8 +38,8 @@ class reply
std::string status_to_string(reply::status_type status);
boost::asio::const_buffer status_to_buffer(reply::status_type status);
};
}
}
}
} // namespace http
} // namespace server
} // namespace osrm
#endif // REPLY_HPP
+3 -3
View File
@@ -20,8 +20,8 @@ struct request
std::string connection;
boost::asio::ip::address endpoint;
};
}
}
}
} // namespace http
} // namespace server
} // namespace osrm
#endif // REQUEST_HPP
+3 -3
View File
@@ -14,7 +14,7 @@ namespace http
{
class reply;
struct request;
}
} // namespace http
class RequestHandler
{
@@ -31,7 +31,7 @@ class RequestHandler
private:
std::unique_ptr<ServiceHandlerInterface> service_handler;
};
}
}
} // namespace server
} // namespace osrm
#endif // REQUEST_HANDLER_HPP
+2 -2
View File
@@ -69,7 +69,7 @@ class RequestParser
http::header current_header;
http::compression_type selected_compression;
};
}
}
} // namespace server
} // namespace osrm
#endif // REQUEST_PARSER_HPP
+2 -2
View File
@@ -109,7 +109,7 @@ class Server
std::shared_ptr<Connection> new_connection;
RequestHandler request_handler;
};
}
}
} // namespace server
} // namespace osrm
#endif // SERVER_HPP
+3 -3
View File
@@ -31,8 +31,8 @@ class BaseService
protected:
OSRM &routing_machine;
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -28,8 +28,8 @@ class MatchService final : public BaseService
unsigned GetVersion() final override { return 1; }
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -28,8 +28,8 @@ class NearestService final : public BaseService
unsigned GetVersion() final override { return 1; }
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -28,8 +28,8 @@ class RouteService final : public BaseService
unsigned GetVersion() final override { return 1; }
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -28,8 +28,8 @@ class TableService final : public BaseService
unsigned GetVersion() final override { return 1; }
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -28,8 +28,8 @@ class TileService final : public BaseService
unsigned GetVersion() final override { return 1; }
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -28,8 +28,8 @@ class TripService final : public BaseService
unsigned GetVersion() final override { return 1; }
};
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
#endif
+3 -3
View File
@@ -24,6 +24,6 @@ bool constrainParamSize(const char *msg_template,
}
return false;
}
}
}
}
} // namespace service
} // namespace server
} // namespace osrm
+3 -3
View File
@@ -16,7 +16,7 @@ namespace json
{
struct Object;
}
}
} // namespace util
namespace server
{
namespace api
@@ -44,7 +44,7 @@ class ServiceHandler final : public ServiceHandlerInterface
std::unordered_map<std::string, std::unique_ptr<service::BaseService>> service_map;
OSRM routing_machine;
};
}
}
} // namespace server
} // namespace osrm
#endif