Skip to content

Commit

Permalink
fix compile on clang-17
Browse files Browse the repository at this point in the history
  • Loading branch information
Qup42 committed Feb 6, 2025
1 parent 39f4754 commit 4cc80c1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions src/engine/Server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ Awaitable<Server::PlannedQuery> Server::planQuery(
// _____________________________________________________________________________
json Server::composeErrorResponseJson(
const string& query, const std::string& errorMsg,
ad_utility::Timer& requestTimer,
const ad_utility::Timer& requestTimer,
const std::optional<ExceptionMetadata>& metadata) {
json j;
using ad_utility::Timer;
Expand Down Expand Up @@ -712,7 +712,7 @@ ad_utility::websocket::OwningQueryId Server::getQueryId(
Awaitable<void> Server::sendStreamableResponse(
const ad_utility::httpUtils::HttpRequest auto& request, auto& send,
MediaType mediaType, const PlannedQuery& plannedQuery,
const QueryExecutionTree& qet, ad_utility::Timer& requestTimer,
const QueryExecutionTree& qet, const ad_utility::Timer& requestTimer,
SharedCancellationHandle cancellationHandle) const {
auto responseGenerator = ExportQueryExecutionTrees::computeResult(
plannedQuery.parsedQuery_, qet, mediaType, requestTimer,
Expand Down Expand Up @@ -802,7 +802,7 @@ ad_utility::websocket::MessageSender Server::createMessageSender(
// ____________________________________________________________________________
Awaitable<void> Server::processQuery(
const ad_utility::url_parser::ParamValueMap& params, ParsedQuery&& query,
ad_utility::Timer& requestTimer,
const ad_utility::Timer& requestTimer,
ad_utility::SharedCancellationHandle cancellationHandle,
QueryExecutionContext& qec,
const ad_utility::httpUtils::HttpRequest auto& request, auto&& send,
Expand Down Expand Up @@ -948,7 +948,7 @@ json Server::processUpdateImpl(

// ____________________________________________________________________________
Awaitable<void> Server::processUpdate(
ParsedQuery&& update, ad_utility::Timer& requestTimer,
ParsedQuery&& update, const ad_utility::Timer& requestTimer,
ad_utility::SharedCancellationHandle cancellationHandle,
QueryExecutionContext& qec,
const ad_utility::httpUtils::HttpRequest auto& request, auto&& send,
Expand Down Expand Up @@ -985,7 +985,7 @@ template <QL_CONCEPT_OR_TYPENAME(QueryOrUpdate) Operation>
Awaitable<void> Server::processQueryOrUpdate(
const ad_utility::url_parser::ParamValueMap& params,
ParsedQuery&& parsedOperation, SharedCancellationHandle cancellationHandle,
QueryExecutionContext qec, ad_utility::Timer& requestTimer,
QueryExecutionContext qec, const ad_utility::Timer& requestTimer,
const ad_utility::httpUtils::HttpRequest auto& request, auto&& send,
TimeLimit timeLimit) {
using namespace ad_utility::httpUtils;
Expand Down
10 changes: 5 additions & 5 deletions src/engine/Server.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ class Server {
const ad_utility::url_parser::ParamValueMap& params,
ParsedQuery&& parsedOperation,
SharedCancellationHandle cancellationHandle, QueryExecutionContext qec,
ad_utility::Timer& requestTimer,
const ad_utility::Timer& requestTimer,
const ad_utility::httpUtils::HttpRequest auto& request, auto&& send,
TimeLimit timeLimit);
// Do the actual execution of a query.
Awaitable<void> processQuery(
const ad_utility::url_parser::ParamValueMap& params, ParsedQuery&& query,
ad_utility::Timer& requestTimer,
const ad_utility::Timer& requestTimer,
ad_utility::SharedCancellationHandle cancellationHandle,
QueryExecutionContext& qec,
const ad_utility::httpUtils::HttpRequest auto& request, auto&& send,
Expand All @@ -165,7 +165,7 @@ class Server {
FRIEND_TEST(ServerTest, createResponseMetadata);
// Do the actual execution of an update.
Awaitable<void> processUpdate(
ParsedQuery&& update, ad_utility::Timer& requestTimer,
ParsedQuery&& update, const ad_utility::Timer& requestTimer,
ad_utility::SharedCancellationHandle cancellationHandle,
QueryExecutionContext& qec,
const ad_utility::httpUtils::HttpRequest auto& request, auto&& send,
Expand Down Expand Up @@ -209,7 +209,7 @@ class Server {

static json composeErrorResponseJson(
const string& query, const std::string& errorMsg,
ad_utility::Timer& requestTimer,
const ad_utility::Timer& requestTimer,
const std::optional<ExceptionMetadata>& metadata = std::nullopt);

json composeStatsJson() const;
Expand Down Expand Up @@ -282,6 +282,6 @@ class Server {
Awaitable<void> sendStreamableResponse(
const ad_utility::httpUtils::HttpRequest auto& request, auto& send,
ad_utility::MediaType mediaType, const PlannedQuery& plannedQuery,
const QueryExecutionTree& qet, ad_utility::Timer& requestTimer,
const QueryExecutionTree& qet, const ad_utility::Timer& requestTimer,
SharedCancellationHandle cancellationHandle) const;
};

0 comments on commit 4cc80c1

Please sign in to comment.