diff --git a/libmamba/include/mamba/download/mirror.hpp b/libmamba/include/mamba/download/mirror.hpp index 2dbcda367..1fa5e38b5 100644 --- a/libmamba/include/mamba/download/mirror.hpp +++ b/libmamba/include/mamba/download/mirror.hpp @@ -66,7 +66,8 @@ namespace mamba::download MirrorRequest& operator=(MirrorRequest&&) = default; }; - struct MirrorStats // Moved out of Mirror internals because of compilers not agreeing: https://godbolt.org/z/GcjWhrb9W + struct MirrorStats // Moved out of Mirror internals because of compilers not agreeing: + // https://godbolt.org/z/GcjWhrb9W { std::optional allowed_connections = std::nullopt; std::size_t max_tried_connections = 0; @@ -121,7 +122,6 @@ namespace mamba::download static_assert(std::default_initializable); util::synchronized_value m_stats; - }; std::unique_ptr make_mirror(std::string url); diff --git a/libmamba/src/core/output.cpp b/libmamba/src/core/output.cpp index d2cdf8a6f..b6e0f8402 100644 --- a/libmamba/src/core/output.cpp +++ b/libmamba/src/core/output.cpp @@ -25,9 +25,9 @@ #include "mamba/core/tasksync.hpp" #include "mamba/core/thread_utils.hpp" #include "mamba/core/util.hpp" -#include "mamba/util/synchronized_value.hpp" #include "mamba/specs/conda_url.hpp" #include "mamba/util/string.hpp" +#include "mamba/util/synchronized_value.hpp" #include "mamba/util/url_manip.hpp" #include "progress_bar_impl.hpp" @@ -276,7 +276,6 @@ namespace mamba using ConsoleBuffer = std::vector; - class ConsoleData { public: @@ -305,6 +304,7 @@ namespace mamba std::unique_ptr progress_bar_manager; ConsoleBuffer buffer; }; + util::synchronized_value m_synched_data; TaskSynchronizer m_tasksync; @@ -450,7 +450,7 @@ namespace mamba name, { .graphics = context().graphics_params, - .ascii_only = context().ascii_only, + .ascii_only = context().ascii_only, }, expected_total ); diff --git a/libmamba/src/core/util.cpp b/libmamba/src/core/util.cpp index 1b17fd4e3..835f220d9 100644 --- a/libmamba/src/core/util.cpp +++ b/libmamba/src/core/util.cpp @@ -1066,7 +1066,7 @@ namespace mamba #endif struct LockedFilesRegistry_Data // made public to workaround CWG2335, should be private - // otherwise + // otherwise { // TODO: replace by something like boost::multiindex or equivalent to avoid having // to handle 2 hashmaps