← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to tests/mir_test_doubles/triggered_main_loop.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-05-12 13:12:55 UTC
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: package-import@ubuntu.com-20150512131255-y7z12i8n4pbvo70x
Tags: upstream-0.13.0+15.10.20150512
Import upstream version 0.13.0+15.10.20150512

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mir_test_doubles/triggered_main_loop.cpp
17
17
 */
18
18
 
19
19
#include "mir_test_doubles/triggered_main_loop.h"
20
 
#include "mir_test_doubles/stub_timer.h"
 
20
#include "mir_test_doubles/stub_alarm.h"
21
21
 
22
22
#include <algorithm>
23
23
#include <sys/select.h>
86
86
}
87
87
 
88
88
std::unique_ptr<mir::time::Alarm>
89
 
mtd::TriggeredMainLoop::notify_in(std::chrono::milliseconds delay,
90
 
                                  callback const& call)
 
89
mtd::TriggeredMainLoop::create_alarm(callback const& call)
91
90
{
92
 
    base::notify_in(delay, call);
 
91
    base::create_alarm(call);
93
92
    timeout_callbacks.push_back(call);
94
93
    return std::unique_ptr<mir::time::Alarm>{new mtd::StubAlarm};
95
94
}