diff options
| -rw-r--r-- | src/buildtool/build_engine/base_maps/rule_map.cpp | 3 | ||||
| -rw-r--r-- | src/buildtool/build_engine/base_maps/source_map.cpp | 2 | ||||
| -rw-r--r-- | src/other_tools/just_mr/main.cpp | 1 | ||||
| -rw-r--r-- | src/other_tools/repo_map/repos_to_setup_map.cpp | 2 | ||||
| -rw-r--r-- | src/other_tools/repo_map/repos_to_setup_map.hpp | 3 |
5 files changed, 3 insertions, 8 deletions
diff --git a/src/buildtool/build_engine/base_maps/rule_map.cpp b/src/buildtool/build_engine/base_maps/rule_map.cpp index 96dc9cd3..2b05c11d 100644 --- a/src/buildtool/build_engine/base_maps/rule_map.cpp +++ b/src/buildtool/build_engine/base_maps/rule_map.cpp @@ -320,8 +320,7 @@ auto CreateRuleMap(gsl::not_null<RuleFileMap*> const& rule_file_map, expr_map->ConsumeAfterKeysReady( ts, std::move(ids), - [ts, - id, + [id, json = rule_it.value(), expr = std::move(expr), target_fields = std::move(*target_fields), diff --git a/src/buildtool/build_engine/base_maps/source_map.cpp b/src/buildtool/build_engine/base_maps/source_map.cpp index ad91a09b..8baf81c2 100644 --- a/src/buildtool/build_engine/base_maps/source_map.cpp +++ b/src/buildtool/build_engine/base_maps/source_map.cpp @@ -63,7 +63,7 @@ auto CreateSourceTargetMap(const gsl::not_null<DirectoryEntriesMap*>& dirs, auto const* ws_root = RepositoryConfig::Instance().WorkspaceRoot(target.repository); - auto src_file_reader = [ts, key, name, setter, logger, dir, ws_root]( + auto src_file_reader = [key, name, setter, logger, dir, ws_root]( bool exists_in_ws_root) { if (ws_root != nullptr and exists_in_ws_root) { if (auto desc = ws_root->ToArtifactDescription( diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp index 6c172e6a..0e0ec0c3 100644 --- a/src/other_tools/just_mr/main.cpp +++ b/src/other_tools/just_mr/main.cpp @@ -1162,7 +1162,6 @@ void DefaultReachableRepositories( &commit_git_map, &content_git_map, &fpath_git_map, - &content_cas_map, &distdir_git_map, &tree_id_git_map, arguments.common.jobs); diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index 19aff9eb..0a2c65ca 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -573,7 +573,6 @@ auto CreateReposToSetupMap(std::shared_ptr<Configuration> const& config, gsl::not_null<CommitGitMap*> const& commit_git_map, gsl::not_null<ContentGitMap*> const& content_git_map, gsl::not_null<FilePathGitMap*> const& fpath_git_map, - gsl::not_null<ContentCASMap*> const& content_cas_map, gsl::not_null<DistdirGitMap*> const& distdir_git_map, gsl::not_null<TreeIdGitMap*> const& tree_id_git_map, std::size_t jobs) -> ReposToSetupMap { @@ -583,7 +582,6 @@ auto CreateReposToSetupMap(std::shared_ptr<Configuration> const& config, commit_git_map, content_git_map, fpath_git_map, - content_cas_map, distdir_git_map, tree_id_git_map](auto ts, auto setter, diff --git a/src/other_tools/repo_map/repos_to_setup_map.hpp b/src/other_tools/repo_map/repos_to_setup_map.hpp index a24d24b9..3306800d 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.hpp +++ b/src/other_tools/repo_map/repos_to_setup_map.hpp @@ -32,9 +32,8 @@ auto CreateReposToSetupMap(std::shared_ptr<Configuration> const& config, gsl::not_null<CommitGitMap*> const& commit_git_map, gsl::not_null<ContentGitMap*> const& content_git_map, gsl::not_null<FilePathGitMap*> const& fpath_git_map, - gsl::not_null<ContentCASMap*> const& content_cas_map, gsl::not_null<DistdirGitMap*> const& distdir_git_map, gsl::not_null<TreeIdGitMap*> const& tree_id_git_map, std::size_t jobs) -> ReposToSetupMap; -#endif // INCLUDED_SRC_OTHER_TOOLS_REPO_MAP_REPOS_TO_SETUP_MAP_HPP
\ No newline at end of file +#endif // INCLUDED_SRC_OTHER_TOOLS_REPO_MAP_REPOS_TO_SETUP_MAP_HPP |