Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the monitor GetCS and JobDone messages not having proper type #610

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the monitor GetCS and JobDone messages not having proper type #610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions services/comm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class Msg {
virtual void fill_from_channel(MsgChannel *c);
virtual void send_to_channel(MsgChannel *c) const;

private:
protected:
Value value_;
};

Expand Down Expand Up @@ -879,14 +879,17 @@ class MonGetCSMsg : public GetCSMsg
MonGetCSMsg()
: GetCSMsg()
{ // overwrite
value_ = MON_GET_CS;
clientid = job_id = 0;
}

MonGetCSMsg(int jobid, int hostid, GetCSMsg *m)
: GetCSMsg(Environments(), m->filename, m->lang, 1, m->target, 0, std::string(), false, m->client_count, m->niceness)
, job_id(jobid)
, clientid(hostid)
{}
{
value_ = MON_GET_CS;
}

virtual void fill_from_channel(MsgChannel *c);
virtual void send_to_channel(MsgChannel *c) const;
Expand Down Expand Up @@ -923,11 +926,15 @@ class MonJobDoneMsg : public JobDoneMsg
public:
MonJobDoneMsg()
: JobDoneMsg()
{}
{
value_ = MON_JOB_DONE;
}

MonJobDoneMsg(const JobDoneMsg &o)
: JobDoneMsg(o)
{}
{
value_ = MON_JOB_DONE;
}
};

class MonLocalJobBeginMsg : public Msg
Expand Down