← Back to branch summary

~alan-griffiths/mir/Migrate-ServerConfigurationWrapping-to-Server-API

« back to all changes in this revision

Viewing changes to src/server/asio_main_loop.cpp

  • Committer: Alan Griffiths
  • Date: 2014-10-21 18:58:03 UTC
  • mfrom: (1988.2.7 mir1)
  • Revision ID: alan@octopull.co.uk-20141021185803-vr8c1114occws5pp
merge lp:~alan-griffiths/mir/make-stub-a-graphics-platform

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/asio_main_loop.cpp
476
476
 
477
477
void AlarmImpl::update_timer()
478
478
{
 
479
    std::lock_guard<decltype(data->m)> lock(data->m);
 
480
    data->state = pending;
479
481
    timer.async_wait(handler);
480
 
    std::lock_guard<decltype(data->m)> lock(data->m);
481
 
    data->state = pending;
482
482
}
483
483
}
484
484