Commit 0e8cb042 authored by Thomas Braun's avatar Thomas Braun
Browse files

Merge branch 'update-clang-and-clang-tidy' into 'main' 

Update LLVM to version 21

- [x] Tag llvm-latest repo
- [x] Update .gitlab-ci.yml

Close #1586

See merge request !1562
parents 36d43051 60a83070

.clang-tidy

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Checks: > 
  -bugprone-switch-missing-default-case,

  -bugprone-throw-keyword-missing,

  -bugprone-use-after-move,

  -bugprone-unintended-char-ostream-output,

  -clang-diagnostic-unused-private-field,

  -concurrency-mt-unsafe,

  -misc-const-correctness,
@@ -96,6 +97,7 @@ WarningsAsErrors: > 
  -bugprone-switch-missing-default-case,

  -bugprone-throw-keyword-missing,

  -bugprone-use-after-move,

  -bugprone-unintended-char-ostream-output,

  -clang-diagnostic-unused-private-field,

  -concurrency-mt-unsafe,

  -misc-const-correctness,

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ variables: &variables 
  UBUNTU_24_JPEG9_IMAGE: "ubuntu-20.04-jpeg9:v11"

  UBUNTU_22_IMAGE: "ubuntu-22.04:v13"

  UBUNTU_24_IMAGE: "ubuntu-24.04:v12"

  LLVM_LATEST_IMAGE: "llvm-latest:v19"

  LLVM_LATEST_IMAGE: "llvm-latest:v20"

  GCC_LATEST_IMAGE: "gcc-latest:v12"

  FEDORA_IMAGE: "fedora37:v10"

  ALPINE_IMAGE: "alpine-3.15:v10"

ci/report.clang-tidy

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Checks: > 
    readability-*,

    bugprone-*,

    -bugprone-multi-level-implicit-pointer-conversion,

    -bugprone-unintended-char-ostream-output,

    -modernize-use-nodiscard,

    -modernize-use-trailing-return-type,

    -performance-enum-size,

log4tango/include/tango/common/log4tango/Portability.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


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



#if defined(_MSC_VER)

#ifdef _MSC_VER



  // We ensure that the header is included because we will redefine the ERROR and DEBUG

  // macros. Also includes winsock2 to prevent windows.h from including 'winsock.h'.

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())

    {