Skip to content

Commit 9c09c64

Browse files
committed
workaround apple-clang incorrect library impl
1 parent b86122f commit 9c09c64

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

libmamba/src/core/output.cpp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,15 @@ namespace mamba
273273
* Console *
274274
***********/
275275

276+
277+
using ConsoleBuffer = std::vector<std::string>;
278+
279+
struct ConsoleSynchedData
280+
{
281+
std::unique_ptr<ProgressBarManager> progress_bar_manager;
282+
ConsoleBuffer buffer;
283+
};
284+
276285
class ConsoleData
277286
{
278287
public:
@@ -290,15 +299,8 @@ namespace mamba
290299
nlohmann::json json_log;
291300
bool is_json_print_cancelled = false;
292301

293-
using Buffer = std::vector<std::string>;
294-
295-
struct Data
296-
{
297-
std::unique_ptr<ProgressBarManager> progress_bar_manager;
298-
Buffer buffer;
299-
};
300302

301-
util::synchronized_value<Data> m_synched_data;
303+
util::synchronized_value<ConsoleSynchedData> m_synched_data;
302304

303305
TaskSynchronizer m_tasksync;
304306
};
@@ -369,7 +371,7 @@ namespace mamba
369371
void Console::print_buffer(std::ostream& ostream)
370372
{
371373
auto& data = instance().p_data;
372-
ConsoleData::Buffer tmp;
374+
ConsoleBuffer tmp;
373375
data->m_synched_data->buffer.swap(tmp);
374376

375377
for (const auto& message : tmp)
@@ -442,8 +444,8 @@ namespace mamba
442444
return p_data->m_synched_data->progress_bar_manager->add_progress_bar(
443445
name,
444446
{
445-
/* .graphics = */ context().graphics_params,
446-
/* .ascii_only = */ context().ascii_only,
447+
.graphics = context().graphics_params,
448+
.ascii_only = context().ascii_only,
447449
},
448450
expected_total
449451
);

0 commit comments

Comments
 (0)