diff options
| -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 | ||||
| -rw-r--r-- | test/utils/TARGETS | 2 | ||||
| -rw-r--r-- | test/utils/large_objects/large_object_utils.cpp | 6 |
8 files changed, 12 insertions, 11 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 diff --git a/test/utils/TARGETS b/test/utils/TARGETS index bbbd363d..9eb5a28a 100644 --- a/test/utils/TARGETS +++ b/test/utils/TARGETS @@ -57,7 +57,7 @@ , "hdrs": ["large_objects/large_object_utils.hpp"] , "srcs": ["large_objects/large_object_utils.cpp"] , "private-deps": - [ ["@", "src", "src/utils/cpp", "gsl"] + [ ["@", "gsl", "", "gsl"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] ] , "stage": ["test", "utils"] diff --git a/test/utils/large_objects/large_object_utils.cpp b/test/utils/large_objects/large_object_utils.cpp index 6c3000ff..de8e6c7d 100644 --- a/test/utils/large_objects/large_object_utils.cpp +++ b/test/utils/large_objects/large_object_utils.cpp @@ -21,8 +21,8 @@ #include <random> #include <string> +#include "gsl/gsl" #include "src/buildtool/file_system/file_system_manager.hpp" -#include "src/utils/cpp/gsl.hpp" namespace { class Randomizer final { @@ -53,7 +53,7 @@ class ChunkPool final { [[nodiscard]] auto operator[](std::size_t index) const noexcept -> std::string const& { - return gsl::at(pool_, static_cast<std::ptrdiff_t>(index)); + return gsl::at(pool_, index); } private: @@ -64,7 +64,7 @@ class ChunkPool final { Randomizer randomizer{1, std::numeric_limits<char>::max()}; for (std::size_t i = 0; i < pool_.size(); ++i) { - auto& chunk = gsl::at(pool_, static_cast<std::ptrdiff_t>(i)); + auto& chunk = gsl::at(pool_, i); chunk.resize(kChunkLength); for (std::size_t j = 0; j < kChunkLength; ++j) { chunk[j] = randomizer.Get(); |