From 4cd33fec63b35e6ee0719ab2b8e7f85353eefaa8 Mon Sep 17 00:00:00 2001
From: Andrew Lindesay <apl@lindesay.co.nz>
Date: Thu, 22 Oct 2020 22:37:49 +1300
Subject: [PATCH] HaikuDepot: Fix x86gcc2 Build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I06c94f6c09f9a4fdec3dc22a2da704225a7845c5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3345
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
---
 src/apps/haikudepot/model/Logger.h  |  1 +
 src/apps/haikudepot/model/Model.cpp | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/apps/haikudepot/model/Logger.h b/src/apps/haikudepot/model/Logger.h
index c427f2864b..7ef2c9dc2b 100644
--- a/src/apps/haikudepot/model/Logger.h
+++ b/src/apps/haikudepot/model/Logger.h
@@ -11,6 +11,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 
 // These macros allow for standardized logging to be output.
diff --git a/src/apps/haikudepot/model/Model.cpp b/src/apps/haikudepot/model/Model.cpp
index cff14623cf..c45eff3364 100644
--- a/src/apps/haikudepot/model/Model.cpp
+++ b/src/apps/haikudepot/model/Model.cpp
@@ -388,7 +388,7 @@ void
 Model::MergeOrAddDepot(const DepotInfoRef depot)
 {
 	BString depotName = depot->Name();
-	for(int32 i = 0; i < fDepots.size(); i++) {
+	for(uint32 i = 0; i < fDepots.size(); i++) {
 		if (fDepots[i]->Name() == depotName) {
 			DepotInfoRef ersatzDepot(new DepotInfo(*(fDepots[i].Get())), true);
 			ersatzDepot->SyncPackages(depot->Packages());
@@ -1096,12 +1096,15 @@ Model::AddRatingStabilities(std::vector<RatingStabilityRef>& values)
 void
 Model::_AddRatingStability(const RatingStabilityRef& value)
 {
-	std::vector<RatingStabilityRef>::const_iterator itInsertionPt
+	std::vector<RatingStabilityRef>::const_iterator itInsertionPtConst
 		= std::lower_bound(
 			fRatingStabilities.begin(),
 			fRatingStabilities.end(),
 			value,
 			&IsRatingStabilityBefore);
+	std::vector<RatingStabilityRef>::iterator itInsertionPt =
+		fRatingStabilities.begin()
+			+ (itInsertionPtConst - fRatingStabilities.begin());
 
 	if (itInsertionPt != fRatingStabilities.end()
 		&& (*itInsertionPt)->Code() == value->Code()) {
@@ -1158,12 +1161,14 @@ Model::AddCategories(std::vector<CategoryRef>& values)
 void
 Model::_AddCategory(const CategoryRef& category)
 {
-	std::vector<CategoryRef>::const_iterator itInsertionPt
+	std::vector<CategoryRef>::const_iterator itInsertionPtConst
 		= std::lower_bound(
 			fCategories.begin(),
 			fCategories.end(),
 			category,
 			&IsPackageCategoryBefore);
+	std::vector<CategoryRef>::iterator itInsertionPt =
+		fCategories.begin() + (itInsertionPtConst - fCategories.begin());
 
 	if (itInsertionPt != fCategories.end()
 		&& (*itInsertionPt)->Code() == category->Code()) {