i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HaikuDepot: Fix x86gcc2 Build

Browse Source 
Change-Id: I06c94f6c09f9a4fdec3dc22a2da704225a7845c5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3345
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Andrew Lindesay
2020-10-22 20:39:17 +00:00
parent 107712bf01
commit 4cd33fec63
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/haikudepot/model/Logger.h
+1
View File
@@ -11,6 +11,7 @@
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
// These macros allow for standardized logging to be output. // These macros allow for standardized logging to be output.
src/apps/haikudepot/model/Model.cpp
+8 -3
View File
@@ -388,7 +388,7 @@ void
Model::MergeOrAddDepot(const DepotInfoRef depot) Model::MergeOrAddDepot(const DepotInfoRef depot)
{ {
BString depotName = depot->Name(); 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) { if (fDepots[i]->Name() == depotName) {
DepotInfoRef ersatzDepot(new DepotInfo(*(fDepots[i].Get())), true); DepotInfoRef ersatzDepot(new DepotInfo(*(fDepots[i].Get())), true);
ersatzDepot->SyncPackages(depot->Packages()); ersatzDepot->SyncPackages(depot->Packages());
@@ -1096,12 +1096,15 @@ Model::AddRatingStabilities(std::vector<RatingStabilityRef>& values)
void void
Model::_AddRatingStability(const RatingStabilityRef& value) Model::_AddRatingStability(const RatingStabilityRef& value)
{ {
std::vector<RatingStabilityRef>::const_iterator itInsertionPt std::vector<RatingStabilityRef>::const_iterator itInsertionPtConst
= std::lower_bound( = std::lower_bound(
fRatingStabilities.begin(), fRatingStabilities.begin(),
fRatingStabilities.end(), fRatingStabilities.end(),
value, value,
&IsRatingStabilityBefore); &IsRatingStabilityBefore);
std::vector<RatingStabilityRef>::iterator itInsertionPt =
fRatingStabilities.begin()
+ (itInsertionPtConst - fRatingStabilities.begin());
if (itInsertionPt != fRatingStabilities.end() if (itInsertionPt != fRatingStabilities.end()
&& (*itInsertionPt)->Code() == value->Code()) { && (*itInsertionPt)->Code() == value->Code()) {
@@ -1158,12 +1161,14 @@ Model::AddCategories(std::vector<CategoryRef>& values)
void void
Model::_AddCategory(const CategoryRef& category) Model::_AddCategory(const CategoryRef& category)
{ {
std::vector<CategoryRef>::const_iterator itInsertionPt std::vector<CategoryRef>::const_iterator itInsertionPtConst
= std::lower_bound( = std::lower_bound(
fCategories.begin(), fCategories.begin(),
fCategories.end(), fCategories.end(),
category, category,
&IsPackageCategoryBefore); &IsPackageCategoryBefore);
std::vector<CategoryRef>::iterator itInsertionPt =
fCategories.begin() + (itInsertionPtConst - fCategories.begin());
if (itInsertionPt != fCategories.end() if (itInsertionPt != fCategories.end()
&& (*itInsertionPt)->Code() == category->Code()) { && (*itInsertionPt)->Code() == category->Code()) {