Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launch_daemon: GCC4 build fix.

Browse Source
This commit is contained in:
Axel Dörfler 2015-07-23 13:16:32 +02:00
parent c0958d1b7f
commit 26f8579d4c
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/servers/launch/Conditions.cpp
View File

@ -27,7 +27,7 @@ public:
virtual bool IsConstant(ConditionContext& context) const;
protected:
void ToString(BString& string) const;
void AddConditionsToString(BString& string) const;
protected:
BObjectList<Condition> fConditions;
@ -199,7 +199,7 @@ ConditionContainer::IsConstant(ConditionContext& context) const
void
ConditionContainer::ToString(BString& string) const
ConditionContainer::AddConditionsToString(BString& string) const
{
string += "[";
@ -243,7 +243,7 @@ BString
AndCondition::ToString() const
{
BString string = "and ";
ConditionContainer::ToString(string);
ConditionContainer::AddConditionsToString(string);
return string;
}
@ -296,7 +296,7 @@ BString
OrCondition::ToString() const
{
BString string = "or ";
ConditionContainer::ToString(string);
ConditionContainer::AddConditionsToString(string);
return string;
}
@ -332,7 +332,7 @@ BString
NotCondition::ToString() const
{
BString string = "not ";
ConditionContainer::ToString(string);
ConditionContainer::AddConditionsToString(string);
return string;
}

6
src/servers/launch/Events.cpp
View File

@ -42,7 +42,7 @@ public:
virtual void SetOwner(BaseJob* owner);
protected:
void ToString(BString& string) const;
void AddEventsToString(BString& string) const;
protected:
BaseJob* fOwner;
@ -304,7 +304,7 @@ EventContainer::SetOwner(BaseJob* owner)
void
EventContainer::ToString(BString& string) const
EventContainer::AddEventsToString(BString& string) const
{
string += "[";
@ -338,7 +338,7 @@ BString
OrEvent::ToString() const
{
BString string = "or ";
EventContainer::ToString(string);
EventContainer::AddEventsToString(string);
return string;
}

8
src/servers/launch/Job.cpp
View File

@ -6,6 +6,8 @@
#include "Job.h"
#include <stdlib.h>
#include <Entry.h>
#include <Looper.h>
#include <Message.h>
@ -342,7 +344,7 @@ Job::Launch()
BString signature("application/");
signature << Name();
return BRoster::Private().Launch(signature.String(), NULL, NULL,
0, NULL, environment.begin(), &fTeam);
0, NULL, &environment[0], &fTeam);
}
// Build argument vector
@ -363,8 +365,8 @@ Job::Launch()
}
// Launch via entry_ref
return BRoster::Private().Launch(NULL, &ref, NULL, count, args.begin(),
environment.begin(), &fTeam);
return BRoster::Private().Launch(NULL, &ref, NULL, count, &args[0],
&environment[0], &fTeam);
}

8
src/servers/launch/SettingsParser.cpp
View File

@ -7,6 +7,8 @@
#include "SettingsParser.h"
#include <string.h>
#include <DriverSettingsMessageAdapter.h>
@ -55,15 +57,15 @@ public:
return B_OK;
BMessage* add = &target;
bool notExpr = parameter.value_count > 1
bool notOperator = parameter.value_count > 1
&& strcmp(parameter.values[0], "not") == 0;
if (notExpr) {
if (notOperator) {
add = &message;
index++;
}
status_t status = AddSubMessage(parameter, index, *add);
if (status == B_OK && notExpr)
if (status == B_OK && notOperator)
status = target.AddMessage("not", &message);
return status;