Commit c4345fe3 authored by Thomas Braun's avatar Thomas Braun
Browse files

treewide: Replace std::lock_guard with std::scoped_lock 

These were not found with clang-tidy.
parent ceabba5d

log4tango/src/AppenderAttachable.cpp

+8 −8
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 


#include <tango/common/log4tango/Portability.h>



#include <mutex>



namespace log4tango

{



using Guard = std::lock_guard<std::mutex>;



AppenderAttachable::AppenderAttachable()

{

    // no-op ctor.
@@ -29,14 +29,14 @@ void AppenderAttachable::add_appender(Appender *appender) 
{

    if(appender != nullptr)

    {

        Guard guard(_appendersMutex);

        std::scoped_lock guard{_appendersMutex};

        _appenders.emplace(appender->get_name(), appender);

    }

}



AppenderList AppenderAttachable::get_all_appenders()

{

    Guard guard(_appendersMutex);

    std::scoped_lock guard{_appendersMutex};

    AppenderList al(0);

    auto it = _appenders.begin();

    auto end = _appenders.end();
@@ -49,7 +49,7 @@ AppenderList AppenderAttachable::get_all_appenders() 


Appender *AppenderAttachable::get_appender(const std::string &name)

{

    Guard guard(_appendersMutex);

    std::scoped_lock guard{_appendersMutex};

    auto it = _appenders.find(name);

    if(it != _appenders.end())

    {
@@ -60,13 +60,13 @@ Appender *AppenderAttachable::get_appender(const std::string &name) 


bool AppenderAttachable::is_attached(Appender *appender)

{

    Guard guard(_appendersMutex);

    std::scoped_lock guard{_appendersMutex};

    return (appender != nullptr) && _appenders.find(appender->get_name()) != _appenders.end();

}



void AppenderAttachable::remove_all_appenders()

{

    Guard guard(_appendersMutex);

    std::scoped_lock guard{_appendersMutex};

    auto it = _appenders.begin();

    auto end = _appenders.end();

    for(; it != end; ++it)
@@ -86,7 +86,7 @@ void AppenderAttachable::remove_appender(Appender *appender) 


void AppenderAttachable::remove_appender(const std::string &name)

{

    Guard guard(_appendersMutex);

    std::scoped_lock guard{_appendersMutex};

    auto it = _appenders.find(name);

    if(it != _appenders.end())

    {

log4tango/src/Logger.cpp

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include <tango/common/log4tango/Logger.h>



#include <mutex>



namespace log4tango

{
@@ -34,7 +36,7 @@ void Logger::set_level(Level::Value level) 
    {

        _level = level;

        { //-- Begin critical section -----------------------------

            std::lock_guard<std::mutex> guard(_appendersMutex);

            std::scoped_lock guard{_appendersMutex};

            if(!_appenders.empty())

            {

                auto i = _appenders.begin();
@@ -52,7 +54,7 @@ void Logger::call_appenders(const LoggingEvent &event) 
{

    std::vector<std::string> *bad_appenders = nullptr;

    { //-- Begin critical section -----------------------------

        std::lock_guard<std::mutex> guard(_appendersMutex);

        std::scoped_lock guard{_appendersMutex};

        if(!_appenders.empty())

        {

            auto i = _appenders.begin();

tests/catch2/utils/entry_points.cpp

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <catch2/catch_session.hpp>



#include <iostream>

#include <mutex>

#include <string_view>

#include <thread>
@@ -48,7 +49,7 @@ class event 
    void set()

    {

        {

            std::lock_guard<std::mutex> lock{mutex};

            std::scoped_lock lock{mutex};

            flag = true;

        }

        cv.notify_one();