Commit 47e59a55 by Maarten L. Hekkelman

for compatibility with gcc 9.4

parent b3496f4e
...@@ -205,12 +205,12 @@ namespace ...@@ -205,12 +205,12 @@ namespace
using cat_order_t = std::vector<elem_t>; using cat_order_t = std::vector<elem_t>;
using iter_t = cat_order_t::iterator; using iter_t = cat_order_t::iterator;
constexpr inline int get_count(iter_t i) inline int get_count(iter_t i)
{ {
return std::get<1>(*i); return std::get<1>(*i);
} }
constexpr inline bool is_on_stack(iter_t i) inline bool is_on_stack(iter_t i)
{ {
return std::get<2>(*i); return std::get<2>(*i);
} }
...@@ -219,7 +219,7 @@ namespace ...@@ -219,7 +219,7 @@ namespace
{ {
if (i == cat_order.end() or get_count(i) >= 0) if (i == cat_order.end() or get_count(i) >= 0)
return; return;
auto &&[cat, count, on_stack] = *i; auto &&[cat, count, on_stack] = *i;
on_stack = true; on_stack = true;
...@@ -233,7 +233,7 @@ namespace ...@@ -233,7 +233,7 @@ namespace
if (ei == cat_order.end()) if (ei == cat_order.end())
continue; continue;
if (not is_on_stack(ei)) if (not is_on_stack(ei))
calculate_cat_order(cat_order, ei, validator); calculate_cat_order(cat_order, ei, validator);
...@@ -242,7 +242,7 @@ namespace ...@@ -242,7 +242,7 @@ namespace
count = parent_count + 1; count = parent_count + 1;
} }
} } // namespace
void datablock::write(std::ostream &os) const void datablock::write(std::ostream &os) const
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment