Let lock_guard deduce its template argument
No functional change, this is a cleanup.
With C++17, it's no longer necessary to specify the teplate argument
when it can be deduced from the types of constructor arguments. This
allows de-cluttering our locking statements.
To avoid typos, this patch was mechanically generated:
perl -p -i -e 's/std::lock_guard<std::mutex>/std::lock_guard/g' \
$(find . -name '*.cpp' -o -name '*.h')
Change-Id: Ibb15d9a6c5b1c861d81353e47d25474eb1d4c2df
diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 4eafcec..5a0c357 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -133,7 +133,7 @@
tlsServers.insert(server);
}
- std::lock_guard<std::mutex> guard(mPrivateDnsLock);
+ std::lock_guard guard(mPrivateDnsLock);
if (explicitlyConfigured) {
mPrivateDnsModes[netId] = PrivateDnsMode::STRICT;
} else if (!tlsServers.empty()) {
@@ -183,7 +183,7 @@
// If the overhead of mutex acquisition proves too high, we could reduce
// it by maintaining an atomic_int32_t counter of TLS-enabled netids, or
// by using an RWLock.
- std::lock_guard<std::mutex> guard(mPrivateDnsLock);
+ std::lock_guard guard(mPrivateDnsLock);
const auto mode = mPrivateDnsModes.find(netId);
if (mode == mPrivateDnsModes.end()) return status;
@@ -205,13 +205,13 @@
if (DBG) {
ALOGD("PrivateDnsConfiguration::clear(%u)", netId);
}
- std::lock_guard<std::mutex> guard(mPrivateDnsLock);
+ std::lock_guard guard(mPrivateDnsLock);
mPrivateDnsModes.erase(netId);
mPrivateDnsTransports.erase(netId);
}
void dump(DumpWriter& dw, unsigned netId) {
- std::lock_guard<std::mutex> guard(mPrivateDnsLock);
+ std::lock_guard guard(mPrivateDnsLock);
const auto& mode = mPrivateDnsModes.find(netId);
dw.println("Private DNS mode: %s", getPrivateDnsModeString(
@@ -295,7 +295,7 @@
constexpr bool NEEDS_REEVALUATION = true;
constexpr bool DONT_REEVALUATE = false;
- std::lock_guard<std::mutex> guard(mPrivateDnsLock);
+ std::lock_guard guard(mPrivateDnsLock);
auto netPair = mPrivateDnsTransports.find(netId);
if (netPair == mPrivateDnsTransports.end()) {