From 888f7afe9fe1a69c27bcc15a3e0fb0be26a11172 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 14:12:47 +0200
Subject: [PATCH] Fix build issues with gcc

---
 src/libstore/local-binary-cache-store.cc | 2 +-
 src/libstore/remote-store.cc             | 2 +-
 src/libstore/s3-binary-cache-store.cc    | 2 +-
 src/libstore/ssh-store.cc                | 2 +-
 src/libstore/store-api.hh                | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 357bc74df..b5744448e 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -20,7 +20,7 @@ private:
 public:
 
     LocalBinaryCacheStore(
-        [[maybe_unused]] const std::string scheme,
+        const std::string scheme,
         const Path & binaryCacheDir,
         const Params & params)
         : StoreConfig(params)
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 4c8ffe71e..1abe236f7 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -133,7 +133,7 @@ UDSRemoteStore::UDSRemoteStore(const Params & params)
 
 
 UDSRemoteStore::UDSRemoteStore(
-        [[maybe_unused]] const std::string scheme,
+        const std::string scheme,
         std::string socket_path,
         const Params & params)
     : UDSRemoteStore(params)
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 0b9c9bb31..b3541d7b8 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -199,7 +199,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
     S3Helper s3Helper;
 
     S3BinaryCacheStoreImpl(
-        [[maybe_unused]] const std::string & scheme,
+        const std::string & scheme,
         const std::string & bucketName,
         const Params & params)
         : StoreConfig(params)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index df383bba6..8b6e48fb0 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -24,7 +24,7 @@ class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
 {
 public:
 
-    SSHStore([[maybe_unused]] const std::string & scheme, const std::string & host, const Params & params)
+    SSHStore(const std::string & scheme, const std::string & host, const Params & params)
         : StoreConfig(params)
         , Store(params)
         , RemoteStore(params)
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 81b979b73..1bea4837b 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -820,6 +820,7 @@ struct Implementations
     {
         if (!registered) registered = new std::vector<StoreFactory>();
         StoreFactory factory{
+            .uriSchemes = T::uriSchemes(),
             .create =
                 ([](const std::string & scheme, const std::string & uri, const Store::Params & params)
                  -> std::shared_ptr<Store>
@@ -827,8 +828,7 @@ struct Implementations
             .getConfig =
                 ([]()
                  -> std::shared_ptr<StoreConfig>
-                 { return std::make_shared<TConfig>(StringMap({})); }),
-            .uriSchemes = T::uriSchemes()
+                 { return std::make_shared<TConfig>(StringMap({})); })
         };
         registered->push_back(factory);
     }