Use auto to simplify lambda expressions

diff --git a/src/ccache.cpp b/src/ccache.cpp
index 81298bd990c2c0033b7888a47163ac7940e19d26..18bec173238e01f1760b77ff6942cb16bdf0aa1a 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -725,7 +725,7 @@ update_manifest_file(Context& ctx,
     || ctx.args_info.output_is_precompiled_header;
 
   ctx.storage.put(
-    manifest_key, core::CacheEntryType::manifest, [&](const std::string& path) {
+    manifest_key, core::CacheEntryType::manifest, [&](const auto& path) {
       LOG("Adding result key to {}", path);
       return Manifest::put(ctx.config,
                            path,
@@ -973,7 +973,7 @@ to_cache(Context& ctx,
 
   MTR_BEGIN("result", "result_put");
   const bool added = ctx.storage.put(
-    *result_key, core::CacheEntryType::result, [&](const std::string& path) {
+    *result_key, core::CacheEntryType::result, [&](const auto& path) {
       write_result(ctx, path, obj_stat, tmp_stderr_path);
       return true;
     });
@@ -1358,7 +1358,7 @@ option_should_be_ignored(const std::string& arg,
                          const std::vector<std::string>& patterns)
 {
   return std::any_of(
-    patterns.cbegin(), patterns.cend(), [&arg](const std::string& pattern) {
+    patterns.cbegin(), patterns.cend(), [&arg](const auto& pattern) {
       const auto& prefix = string_view(pattern).substr(0, pattern.length() - 1);
       return (
         pattern == arg

diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index 31623902378258b8c7610c2142b474a2baa7c52f..fec33ea2f551af364c667d6966fe4a92e87d2101 100644 (file)
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -200,7 +200,7 @@ Storage::get(const Digest& key, const core::CacheEntryType type)
     throw core::Fatal("Error writing to {}: {}", tmp_file.path, e.what());
   }
 
-  primary.put(key, type, [&](const std::string& path) {
+  primary.put(key, type, [&](const auto& path) {
     try {
       Util::copy_file(tmp_file.path, path);
     } catch (const core::Error& e) {

diff --git a/src/storage/primary/PrimaryStorage_statistics.cpp b/src/storage/primary/PrimaryStorage_statistics.cpp
index 3a2e015e57ee98bb786ab243dbb89c095ef4a2e1..99cc4fc46ae032db7a549750eb212182bf443765 100644 (file)
--- a/src/storage/primary/PrimaryStorage_statistics.cpp
+++ b/src/storage/primary/PrimaryStorage_statistics.cpp
@@ -51,7 +51,7 @@ PrimaryStorage::zero_all_statistics()
 
   for_each_level_1_and_2_stats_file(
     m_config.cache_dir(), [=](const std::string& path) {
-      StatsFile(path).update([=](core::StatisticsCounters& cs) {
+      StatsFile(path).update([=](auto& cs) {
         for (const auto statistic : zeroable_fields) {
           cs.set(statistic, 0);
         }