lock_guard: remove explicit template
Change-Id: Iec6d57d6a66557a66096c7a8f67e025c6ca5a64c
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 52a6383..d9beef8 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -70,8 +70,6 @@
//==============================================================================
-using MutexGuard = std::lock_guard<std::mutex>;
-using MutexLock = std::unique_lock<std::mutex>;
using namespace upnp;
//==============================================================================
@@ -233,7 +231,7 @@
{
for (auto& c : peerChannels_)
c.stop();
- std::lock_guard<std::mutex> lk(sendDataMutex_);
+ std::lock_guard lk(sendDataMutex_);
destroying_ = true;
waitDataCv_.notify_all();
}
@@ -926,7 +924,7 @@
{
// Must be called once !
- std::lock_guard<std::mutex> lock(upnpMutex_);
+ std::lock_guard lock(upnpMutex_);
if (not upnp_)
return;
@@ -945,7 +943,7 @@
// To use a mapping, it must be valid, open and has valid host address.
if (mapPtr and mapPtr->getMapKey() and (mapPtr->getState() == MappingState::OPEN)
and mapPtr->hasValidHostAddress()) {
- std::lock_guard<std::mutex> lock(upnpMappingsMutex_);
+ std::lock_guard lock(upnpMappingsMutex_);
auto ret = upnpMappings_.emplace(mapPtr->getMapKey(), *mapPtr);
if (ret.second) {
if (logger_)
@@ -1070,7 +1068,7 @@
if (not hasUpnp())
return {};
- std::lock_guard<std::mutex> lock(upnpMappingsMutex_);
+ std::lock_guard lock(upnpMappingsMutex_);
if (upnpMappings_.size() < (size_t)compCount_) {
if (logger_)
@@ -1132,7 +1130,7 @@
{
auto& io = compIO_[comp_id - 1];
- std::lock_guard<std::mutex> lk(io.mutex);
+ std::lock_guard lk(io.mutex);
if (io.recvCb) {
io.recvCb((uint8_t*) pkt, size);
@@ -1633,7 +1631,7 @@
{
ASSERT_COMP_ID(compId, getComponentCount());
auto& io = pimpl_->compIO_[compId - 1];
- std::lock_guard<std::mutex> lk(io.mutex);
+ std::lock_guard lk(io.mutex);
if (io.queue.empty()) {
ec = std::make_error_code(std::errc::resource_unavailable_try_again);
@@ -1666,7 +1664,7 @@
ASSERT_COMP_ID(compId, getComponentCount());
auto& io = pimpl_->compIO_[compId - 1];
- std::lock_guard<std::mutex> lk(io.mutex);
+ std::lock_guard lk(io.mutex);
io.recvCb = std::move(cb);
if (io.recvCb) {