Skip to content
Snippets Groups Projects

Fix clang compilation error

Merged Florian Uhlig requested to merge f.uhlig/cbmroot:fix_clang_error into master
1 file
+ 10
1
Compare changes
  • Side-by-side
  • Inline
+ 10
1
@@ -184,8 +184,17 @@ namespace cbm::algo
std::vector<fles::MicrosliceDescriptor> msDesc; // microslice descriptors
std::vector<const u8*> msContent; // pointer to microslice content
auto legalEqIds = GetEqIds(algos);
auto [numMs, sizeBytes] =
// Workaround a problem for some clang versions
// Capturing structured bindings either is avaialable with C++20
// Obviously GCC supports it already and has no problems but clang or at
// least some clang versions fail during compilation
// auto [numMs, sizeBytes] =
// ParallelInit(ts, subsystem, gsl::make_span(legalEqIds), sys_ver, genericMonitor, msEqIds, msDesc, msContent);
std::pair<size_t, size_t> tmp =
ParallelInit(ts, subsystem, gsl::make_span(legalEqIds), sys_ver, genericMonitor, msEqIds, msDesc, msContent);
auto numMs = tmp.first;
auto sizeBytes = tmp.second;
std::vector<std::vector<Digi>> msDigis(numMs); // unpacked digis per microslice
std::vector<Monitor> monitor(numMs); // unpacking monitoring data per microslice
Loading