Skip to content

Commit 6842acb

Browse files
committed
[BUILDING] Fix compile issues
1 parent d4731ca commit 6842acb

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

Launcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
5353
return (message);
5454
}
5555

56-
/* virtual */ void Launcher::Deinitialize(PluginHost::IShell* service)
56+
/* virtual */ void Launcher::Deinitialize(PluginHost::IShell* /* service */)
5757
{
5858
ASSERT(_service == service);
5959
ASSERT(_memory != nullptr);

Launcher.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class Launcher : public PluginHost::IPlugin {
110110
inline uint32_t GroupId () const {
111111
return((Event() == EVENT_UID) || (Event() == EVENT_GID) ? _info.event_data.id.e.egid : 0);
112112
}
113-
virtual uint16_t Message(uint8_t stream[], const uint16_t length) const override {
113+
virtual uint16_t Message(uint8_t stream[], const uint16_t /* length */) const override {
114114

115115
memcpy(stream, &_status, sizeof(_status));
116116

@@ -539,15 +539,15 @@ class Launcher : public PluginHost::IPlugin {
539539
};
540540

541541
public:
542-
class Job: public Core::IDispatchType<void> {
542+
class Job: public Core::IDispatch {
543543
private:
544+
typedef std::vector<uint32_t> ProcessList;
545+
546+
public:
544547
Job() = delete;
545548
Job(const Job&) = delete;
546549
Job& operator=(const Job&) = delete;
547550

548-
typedef std::vector<uint32_t> ProcessList;
549-
550-
public:
551551
Job(Config* config, const Time& interval, Exchange::IMemory* memory)
552552
: _adminLock()
553553
, _options(config->Command.Value().c_str())
@@ -576,14 +576,14 @@ class Launcher : public PluginHost::IPlugin {
576576
}
577577
_memory->AddRef();
578578
}
579-
~Job()
579+
~Job() override
580580
{
581581
_memory->Release();
582582
}
583583

584584
public:
585585
uint32_t ExitCode() {
586-
return (_process.IsActive() == false ? _process.ExitCode() : Core::ERROR_NONE);
586+
return (_process.IsActive() == false ? _process.ExitCode() : static_cast<uint32_t>(Core::ERROR_NONE));
587587
}
588588
bool IsActive() const {
589589
return (_processList.size() > 0);
@@ -681,7 +681,10 @@ class Launcher : public PluginHost::IPlugin {
681681
}
682682

683683
private:
684-
virtual void Dispatch() override
684+
string Identifier() const override {
685+
return (_T("Launcher::Command(\"") + _options.Command() + _T("\")"));
686+
}
687+
void Dispatch() override
685688
{
686689
// Let limit the jitter on the next run, if required..
687690
Core::Time nextRun (Core::Time::Now());

0 commit comments

Comments
 (0)