diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-04-29 12:27:59 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2024-05-02 10:51:04 +0200 |
| commit | a8fc6fc51c6c9ef90ae1480f0ff4448d69b0e235 (patch) | |
| tree | d2b63497133aa24223c3a114bccdc5a588dea2a4 /src | |
| parent | 6c0471e40c56a92a704fcdcef9c3e7e7e96af3fa (diff) | |
| download | justbuild-a8fc6fc51c6c9ef90ae1480f0ff4448d69b0e235.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/graph_traverser/graph_traverser.hpp | 2 | ||||
| -rw-r--r-- | src/buildtool/main/install_cas.cpp | 3 | ||||
| -rw-r--r-- | src/other_tools/root_maps/commit_git_map.cpp | 2 | ||||
| -rw-r--r-- | src/other_tools/root_maps/content_git_map.cpp | 4 | ||||
| -rw-r--r-- | src/other_tools/root_maps/distdir_git_map.cpp | 2 | ||||
| -rw-r--r-- | src/other_tools/root_maps/fpath_git_map.cpp | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp index 776b06b8..5402a149 100644 --- a/src/buildtool/graph_traverser/graph_traverser.hpp +++ b/src/buildtool/graph_traverser/graph_traverser.hpp @@ -626,7 +626,7 @@ class GraphTraverser { if (not output_paths or not remote_api_->RetrieveToPaths( - object_infos, *output_paths, GetLocalApi())) { + object_infos, *output_paths, &(*GetLocalApi()))) { Logger::Log( logger_, LogLevel::Error, "Could not retrieve outputs."); return std::nullopt; diff --git a/src/buildtool/main/install_cas.cpp b/src/buildtool/main/install_cas.cpp index e6bb9128..e5c2a2a0 100644 --- a/src/buildtool/main/install_cas.cpp +++ b/src/buildtool/main/install_cas.cpp @@ -125,7 +125,8 @@ auto FetchAndInstallArtifacts( } if (out) { - if (not api->RetrieveToPaths({object_info}, {*out}, alternative_api)) { + if (not api->RetrieveToPaths( + {object_info}, {*out}, &(*alternative_api))) { Logger::Log(LogLevel::Error, "failed to retrieve artifact."); return false; } 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 |