Mercurial > hg > Members > kono > Cerium

comparison include/TaskManager/SchedExit.h @ 273:3e9c0039e15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 04 Jun 2009 00:12:47 +0900
parents f872cc000fe0
children bcb81858aa62
comparison
equal deleted inserted replaced
272:f3b406eecf1c 273:3e9c0039e15c
15 15
16 class SchedExit : public SchedTaskBase { 16 class SchedExit : public SchedTaskBase {
17 public: 17 public:
18 BASE_NEW_DELETE(SchedExit); 18 BASE_NEW_DELETE(SchedExit);
19 19
20 <<<<<<< local
21 SchedExit(Scheduler *m) {
22 scheduler = m;
23 }
24
25 =======
26 >>>>>>> other
27 SchedTaskBase* next(Scheduler *, SchedTaskBase *); 20 SchedTaskBase* next(Scheduler *, SchedTaskBase *);
28 }; 21 };
29 22
30 #endif 23 #endif