Commit e8f24f61 by Maarten L. Hekkelman

- Fixed copy/paste error in Category interface

- message in progress finished
parent 9454fdc2
...@@ -1880,10 +1880,10 @@ class Category ...@@ -1880,10 +1880,10 @@ class Category
const Row operator[](Condition &&cond) const; const Row operator[](Condition &&cond) const;
template <typename... Ts, typename... Ns> template <typename... Ts, typename... Ns>
iterator_proxy<const Row, Ts...> rows(Ns... names) const iterator_proxy<const Category, Ts...> rows(Ns... names) const
{ {
static_assert(sizeof...(Ts) == sizeof...(Ns), "The number of column titles should be equal to the number of types to return"); static_assert(sizeof...(Ts) == sizeof...(Ns), "The number of column titles should be equal to the number of types to return");
return iterator_proxy<const Row, Ts...>(*this, begin(), {names...}); return iterator_proxy<const Category, Ts...>(*this, begin(), {names...});
} }
template <typename... Ts, typename... Ns> template <typename... Ts, typename... Ns>
......
...@@ -708,7 +708,7 @@ void ProgressImpl::PrintDone() ...@@ -708,7 +708,7 @@ void ProgressImpl::PrintDone()
std::chrono::duration<double> elapsed = std::chrono::system_clock::now() - mStart; std::chrono::duration<double> elapsed = std::chrono::system_clock::now() - mStart;
std::ostringstream msgstr; std::ostringstream msgstr;
msgstr << mAction << " done in " << elapsed << " cpu / %ws wall"; msgstr << mAction << " done in " << elapsed << " seconds";
auto msg = msgstr.str(); auto msg = msgstr.str();
uint32_t width = get_terminal_width(); uint32_t width = get_terminal_width();
......
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