Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Code Issues Releases Activity

gcc-4.5 compatibility fixes

Browse Source
This commit is contained in:
Pavel Labath 2011-03-27 14:45:38 +02:00
parent 17cf8517c3
commit b1eab2be0e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mail.cc
View File

@ -145,13 +145,13 @@ namespace {
virtual void merge(callback_base &&other) virtual void merge(callback_base &&other)
{ {
Base::merge(other);
mail_cb &&o = dynamic_cast<mail_cb &&>(other); mail_cb &&o = dynamic_cast<mail_cb &&>(other);
if(retries < o.retries) { if(retries < o.retries) {
retries = o.retries; retries = o.retries;
fail = 0; fail = 0;
} }
Base::merge(std::move(other));
} }
mail_cb(uint32_t period, const Tuple &tuple, uint16_t retries_) mail_cb(uint32_t period, const Tuple &tuple, uint16_t retries_)

2
src/update-cb.cc
View File

@ -79,7 +79,7 @@ namespace conky {
const auto &p = callbacks.insert(h); const auto &p = callbacks.insert(h);
if(not p.second) if(not p.second)
(*p.first)->merge(*h); (*p.first)->merge(std::move(*h));
return *p.first; return *p.first;
} }