luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some merge issues.

This commit is contained in:
Matthias Koefferlein 2021-03-29 15:18:19 +02:00
parent 8fda92a9c4
commit 311d0e3ca7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tl/tl/tlProgress.cc
View File

@ -138,7 +138,7 @@ const double yield_timeout = 0.3;
const size_t default_yield_interval = 1000;
Progress::Progress (const std::string &desc, size_t yield_interval, bool can_cancel)
: m_desc (desc), m_title (desc),
: m_desc (desc), m_title (desc), m_final (false),
m_interval_count (0),
m_yield_interval (yield_interval == 0 ? default_yield_interval : yield_interval),
m_last_value (-1.0),

1
src/tl/tl/tlProgress.h
View File

@ -315,6 +315,7 @@ private:
std::string m_desc, m_last_desc;
std::string m_title;
bool m_final;
size_t m_interval_count;
size_t m_yield_interval;
double m_last_value;