From a8fc6fc51c6c9ef90ae1480f0ff4448d69b0e235 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Mon, 29 Apr 2024 12:27:59 +0200
Subject: Small changes to allow gsl-lite support

The gsl-lite implementation is slightly more picky in terms of
type conversions and constness resolution in initializers,
therefore small changes were needed.
---
 src/other_tools/root_maps/commit_git_map.cpp  | 2 +-
 src/other_tools/root_maps/content_git_map.cpp | 4 ++--
 src/other_tools/root_maps/distdir_git_map.cpp | 2 +-
 src/other_tools/root_maps/fpath_git_map.cpp   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/other_tools')

diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp
index f9da1300..913a7e15 100644
--- a/src/other_tools/root_maps/commit_git_map.cpp
+++ b/src/other_tools/root_maps/commit_git_map.cpp
@@ -118,7 +118,7 @@ void EnsureRootAsAbsent(
                 // for the serve endpoint to retrieve it and set up the root
                 if (not EnsureAbsentRootOnServe(tree_id,
                                                 repo_root,
-                                                *remote_api,
+                                                &(*remote_api.value()),
                                                 logger,
                                                 true /*no_sync_is_fatal*/)) {
                     return;
diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp
index c0c06513..cccab118 100644
--- a/src/other_tools/root_maps/content_git_map.cpp
+++ b/src/other_tools/root_maps/content_git_map.cpp
@@ -120,7 +120,7 @@ void EnsureRootAsAbsent(
                     if (not EnsureAbsentRootOnServe(
                             tree_id,
                             StorageConfig::GitRoot(),
-                            *remote_api,
+                            &(*remote_api.value()),
                             logger,
                             /*no_sync_is_fatal=*/true)) {
                         return;
@@ -144,7 +144,7 @@ void EnsureRootAsAbsent(
                 // root
                 if (not EnsureAbsentRootOnServe(tree_id,
                                                 StorageConfig::GitRoot(),
-                                                *remote_api,
+                                                &(*remote_api.value()),
                                                 logger,
                                                 /*no_sync_is_fatal=*/true)) {
                     return;
diff --git a/src/other_tools/root_maps/distdir_git_map.cpp b/src/other_tools/root_maps/distdir_git_map.cpp
index e003e000..c1d9bd11 100644
--- a/src/other_tools/root_maps/distdir_git_map.cpp
+++ b/src/other_tools/root_maps/distdir_git_map.cpp
@@ -254,7 +254,7 @@ auto CreateDistdirGitMap(
                                     if (not EnsureAbsentRootOnServe(
                                             distdir_tree_id,
                                             StorageConfig::GitRoot(),
-                                            *remote_api,
+                                            &(*remote_api.value()),
                                             logger,
                                             true /*no_sync_is_fatal*/)) {
                                         return;
diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp
index d5aeaf3f..186261b7 100644
--- a/src/other_tools/root_maps/fpath_git_map.cpp
+++ b/src/other_tools/root_maps/fpath_git_map.cpp
@@ -65,7 +65,7 @@ void CheckServeAndSetRoot(
             else {
                 if (not EnsureAbsentRootOnServe(tree_id,
                                                 repo_root,
-                                                *remote_api,
+                                                &(*remote_api.value()),
                                                 logger,
                                                 /*no_sync_is_fatal=*/absent)) {
                     return;  // fatal
-- 
cgit v1.2.3