File 0004-gcc-says-it-s-not-a-constant-expression.patch of Package arangodb3
From fab80c8d04eb73260198a8541fef3fbe8b65daa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Wed, 8 Mar 2023 11:32:32 +0100
Subject: [PATCH 4/5] gcc says it's not a constant expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Features::template contains() is no constexpr
Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
---
client-tools/FeaturePhases/BasicFeaturePhaseClient.h | 6 +++---
lib/ApplicationFeatures/ApplicationServer.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client-tools/FeaturePhases/BasicFeaturePhaseClient.h b/client-tools/FeaturePhases/BasicFeaturePhaseClient.h
index 6bba5abff33..6dacf0f48d3 100644
--- a/client-tools/FeaturePhases/BasicFeaturePhaseClient.h
+++ b/client-tools/FeaturePhases/BasicFeaturePhaseClient.h
@@ -42,16 +42,16 @@ class BasicFeaturePhaseClient : public ApplicationFeaturePhase {
explicit BasicFeaturePhaseClient(Server& server)
: ApplicationFeaturePhase(server, *this) {
setOptional(false);
- if constexpr (Server::template contains<GreetingsFeaturePhase>()) {
+ if (Server::template contains<GreetingsFeaturePhase>()) {
startsAfter<GreetingsFeaturePhase, Server>();
}
if constexpr (Server::template contains<EncryptionFeature>()) {
startsAfter<EncryptionFeature, Server>();
}
- if constexpr (Server::template contains<SslFeature>()) {
+ if (Server::template contains<SslFeature>()) {
startsAfter<SslFeature, Server>();
}
- if constexpr (Server::template contains<HttpEndpointProvider>()) {
+ if (Server::template contains<HttpEndpointProvider>()) {
startsAfter<HttpEndpointProvider, Server>();
}
}
diff --git a/lib/ApplicationFeatures/ApplicationServer.h b/lib/ApplicationFeatures/ApplicationServer.h
index 7f681fc03c6..20e3000d341 100644
--- a/lib/ApplicationFeatures/ApplicationServer.h
+++ b/lib/ApplicationFeatures/ApplicationServer.h
@@ -380,13 +380,13 @@ class ApplicationServerT : public ApplicationServer {
public:
// Returns feature identifier.
template<typename T>
- static constexpr size_t id() noexcept {
+ static size_t id() noexcept {
return Features::template id<T>();
}
// Returns true if a feature denoted by `T` is registered with the server.
template<typename T>
- static constexpr bool contains() noexcept {
+ static bool contains() noexcept {
return Features::template contains<T>();
}
--
2.39.2