folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reduce number of compiler warnings (#1691)

This commit is contained in:
Wolf Vollprecht 2022-05-20 18:06:44 +02:00 committed by GitHub
parent 165735558a
commit c124c4c818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmamba/src/api/repoquery.cpp
View File

@ -80,6 +80,7 @@ namespace mamba
switch (format) switch (format)
{ {
case QueryResultFormat::kTREE: case QueryResultFormat::kTREE:
case QueryResultFormat::kPRETTY:
res.tree(std::cout); res.tree(std::cout);
break; break;
case QueryResultFormat::kJSON: case QueryResultFormat::kJSON:
@ -95,6 +96,7 @@ namespace mamba
switch (format) switch (format)
{ {
case QueryResultFormat::kTREE: case QueryResultFormat::kTREE:
case QueryResultFormat::kPRETTY:
res.tree(std::cout); res.tree(std::cout);
break; break;
case QueryResultFormat::kJSON: case QueryResultFormat::kJSON:

3
libmamba/src/core/output.cpp
View File

@ -257,8 +257,9 @@ namespace mamba
* Console * * Console *
***********/ ***********/
struct ConsoleData class ConsoleData
{ {
public:
std::mutex m_mutex; std::mutex m_mutex;
std::unique_ptr<ProgressBarManager> p_progress_bar_manager; std::unique_ptr<ProgressBarManager> p_progress_bar_manager;

2
libmamba/src/core/util.cpp
View File

@ -1022,7 +1022,7 @@ namespace mamba
return signum; return signum;
}); });
MainExecutor::instance().take_ownership(std::move(t.extract())); MainExecutor::instance().take_ownership(t.extract());
{ {
std::unique_lock<std::mutex> l(m); std::unique_lock<std::mutex> l(m);

2
libmamba/src/core/util_os.cpp
View File

@ -423,7 +423,7 @@ namespace mamba
// Enable buffering to prevent VS from chopping up UTF-8 byte sequences // Enable buffering to prevent VS from chopping up UTF-8 byte sequences
setvbuf(stdout, nullptr, _IOFBF, 1000); setvbuf(stdout, nullptr, _IOFBF, 1000);
#else #else
static constexpr char* utf8_locales[] = { static constexpr const char* utf8_locales[] = {
"C.UTF-8", "C.UTF-8",
"POSIX.UTF-8", "POSIX.UTF-8",
"en_US.UTF-8", "en_US.UTF-8",

2
libmambapy/src/main.cpp
View File

@ -215,6 +215,7 @@ PYBIND11_MODULE(bindings, m)
switch (format) switch (format)
{ {
case query::TREE: case query::TREE:
case query::PRETTY:
res.tree(res_stream); res.tree(res_stream);
break; break;
case query::JSON: case query::JSON:
@ -237,6 +238,7 @@ PYBIND11_MODULE(bindings, m)
switch (format) switch (format)
{ {
case query::TREE: case query::TREE:
case query::PRETTY:
res.tree(res_stream); res.tree(res_stream);
break; break;
case query::JSON: case query::JSON:

4
micromamba/src/completer.cpp
View File

@ -92,7 +92,7 @@ add_activate_completion(CLI::App* app, std::vector<std::string>& completer_args,
// Mock functions just for completion // Mock functions just for completion
CLI::App* activate_subcom = app->add_subcommand("activate"); CLI::App* activate_subcom = app->add_subcommand("activate");
CLI::App* deactivate_subcom = app->add_subcommand("deactivate"); app->add_subcommand("deactivate");
activate_subcom->callback( activate_subcom->callback(
[app, &completer_args, &completed]() [app, &completer_args, &completed]()
{ {
@ -124,7 +124,7 @@ add_ps_completion(CLI::App* app, std::vector<std::string>& completer_args, bool&
{ complete_options(list_subcom, completer_args, completed); }); { complete_options(list_subcom, completer_args, completed); });
stop_subcom->callback( stop_subcom->callback(
[app, &completer_args, &completed]() [&completer_args, &completed]()
{ {
if (completer_args.size() == 1) if (completer_args.size() == 1)
{ {