github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-23 06:13:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

umk fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10316 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-10-14 17:07:41 +00:00
parent 0aefe97a8a
commit 00a1da1178
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/umk/Console.cpp
View file

@ -220,7 +220,7 @@ bool Console::Wait()
}
}
void Console::OnFinish(Callback cb)
void Console::OnFinish(Event<> cb)
{
Finisher& f = finisher.Add();
f.serial = serial;

2
uppsrc/umk/IdeContext.cpp
View file

@ -87,7 +87,7 @@ bool Ide::IdeConsoleWait(int slot)
return true;
}
void Ide::IdeConsoleOnFinish(Callback cb)
void Ide::IdeConsoleOnFinish(Event<> cb)
{
console.OnFinish(cb);
}

6
uppsrc/umk/umake.h
View file

@ -37,7 +37,7 @@ protected:
struct Finisher {
int serial;
Callback cb;
Event<> cb;
};
Array<Slot> processes;
@ -78,7 +78,7 @@ public:
void Wait(int slot);
bool Wait();
void OnFinish(Callback cb);
void OnFinish(Event<> cb);
void WrapText(bool w) { wrap_text = w; }
@ -115,7 +115,7 @@ struct Ide : public IdeContext, public MakeBuild {
virtual void IdeConsoleEndGroup();
virtual bool IdeConsoleWait();
virtual bool IdeConsoleWait(int slot);
virtual void IdeConsoleOnFinish(Callback cb);
virtual void IdeConsoleOnFinish(Event<> cb);
virtual bool IdeIsDebug() const ;
virtual void IdeEndDebug();