Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-07-05 21:43:36 +02:00
9 changed files with 55 additions and 20 deletions

View File

@@ -469,7 +469,7 @@ int CRCInput::addTimer(uint64_t Interval, bool oneshot, bool correct_time )
_newtimer.correct_time = correct_time;
//printf("adding timer %d (0x%llx, 0x%llx)\n", _newtimer.id, _newtimer.times_out, Interval);
printf("adding timer %d (0x%llx, 0x%llx)\n", _newtimer.id, _newtimer.times_out, Interval);
std::vector<timer>::iterator e;
for ( e= timers.begin(); e!= timers.end(); ++e )
@@ -482,7 +482,7 @@ int CRCInput::addTimer(uint64_t Interval, bool oneshot, bool correct_time )
void CRCInput::killTimer(uint32_t &id)
{
//printf("killing timer %d\n", id);
printf("killing timer %d\n", id);
if(id == 0)
return;