From 26f8579d4cac74375a9a8b322a86726242879235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 23 Jul 2015 13:16:32 +0200
Subject: [PATCH] launch_daemon: GCC4 build fix.

---
 src/servers/launch/Conditions.cpp     | 10 +++++-----
 src/servers/launch/Events.cpp         |  6 +++---
 src/servers/launch/Job.cpp            |  8 +++++---
 src/servers/launch/SettingsParser.cpp |  8 +++++---
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/servers/launch/Conditions.cpp b/src/servers/launch/Conditions.cpp
index ad70031d82..c825fdffe3 100644
--- a/src/servers/launch/Conditions.cpp
+++ b/src/servers/launch/Conditions.cpp
@@ -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;
 }
 
diff --git a/src/servers/launch/Events.cpp b/src/servers/launch/Events.cpp
index 4454ae49db..8714339b28 100644
--- a/src/servers/launch/Events.cpp
+++ b/src/servers/launch/Events.cpp
@@ -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;
 }
 
diff --git a/src/servers/launch/Job.cpp b/src/servers/launch/Job.cpp
index 224a17ef25..7432921aaf 100644
--- a/src/servers/launch/Job.cpp
+++ b/src/servers/launch/Job.cpp
@@ -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);
 }
 
 
diff --git a/src/servers/launch/SettingsParser.cpp b/src/servers/launch/SettingsParser.cpp
index 38d447598d..9f26580102 100644
--- a/src/servers/launch/SettingsParser.cpp
+++ b/src/servers/launch/SettingsParser.cpp
@@ -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;