From 0374b80dd407d7b35654a01e3c7526b749d3464e Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 23 Dec 2022 17:18:42 +0100 Subject: Just-MR: Remove wrong pass-by-reference when wrapping loggers Passing the logger by reference would require the caller to be kept alive. Also, being a shared_ptr, the logger can be passed by value at almost no cost. --- src/other_tools/root_maps/commit_git_map.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/other_tools/root_maps/commit_git_map.cpp') diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp index deefaa32..e8dfeef4 100644 --- a/src/other_tools/root_maps/commit_git_map.cpp +++ b/src/other_tools/root_maps/commit_git_map.cpp @@ -81,8 +81,8 @@ auto CreateCommitGitMap( } // setup a wrapped_logger auto wrapped_logger = std::make_shared( - [&logger, target_path = repo_root](auto const& msg, - bool fatal) { + [logger, target_path = repo_root](auto const& msg, + bool fatal) { (*logger)(fmt::format("While ensuring commit for " "repository {}:\n{}", target_path.string(), @@ -127,7 +127,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // setup wrapped logger auto wrapped_logger = std::make_shared( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format("While checking commit exists:\n{}", msg), fatal); }); @@ -181,7 +181,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // setup wrapped logger auto wrapped_logger = std::make_shared( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format( "While fetching via tmp repo:\n{}", msg), fatal); @@ -194,7 +194,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // setup wrapped logger wrapped_logger = std::make_shared( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format( "While checking commit exists:\n{}", msg), fatal); @@ -247,7 +247,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, // setup wrapped logger auto wrapped_logger = std::make_shared( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting subtree " "from commit:\n{}", @@ -284,7 +284,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, else { // setup wrapped logger auto wrapped_logger = std::make_shared( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting subtree from commit:\n{}", msg), fatal); -- cgit v1.2.3