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

Fix build of pkgman with gcc2.

Browse Source 
* I have no idea why, but gcc2 considers BSolverRepository* and
  PackageManager::InstalledRepository* as distinct pointer types, which
  it doesn't like to compare without a cast. Circumvent by static 
  casting to BSolverRepository*.
This commit is contained in:
Oliver Tappe
2013-08-29 23:11:14 +02:00
parent c5c787ea41
commit c92aabd434
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/pkgman/command_search.cpp
+7 -4
View File
@@ -60,7 +60,7 @@ get_terminal_width()
struct winsize windowSize; struct winsize windowSize;
if (isatty(fd) == 1 && ioctl(fd, TIOCGWINSZ, &windowSize) == 0) if (isatty(fd) == 1 && ioctl(fd, TIOCGWINSZ, &windowSize) == 0)
return windowSize.ws_col; return windowSize.ws_col;
return INT_MAX; return INT_MAX;
} }
@@ -185,11 +185,14 @@ SearchCommand::Execute(int argc, const char* const* argv)
BSolverPackage* package = packages.ItemAt(i); BSolverPackage* package = packages.ItemAt(i);
const char* installed = ""; const char* installed = "";
if (package->Repository() == packageManager.SystemRepository()) if (package->Repository() == static_cast<const BSolverRepository*>(
packageManager.SystemRepository()))
installed = "system"; installed = "system";
else if (package->Repository() == packageManager.CommonRepository()) else if (package->Repository() == static_cast<const BSolverRepository*>(
packageManager.CommonRepository()))
installed = "common"; installed = "common";
else if (package->Repository() == packageManager.HomeRepository()) else if (package->Repository() == static_cast<const BSolverRepository*>(
packageManager.HomeRepository()))
installed = "home"; installed = "home";
printf("%-*s %-*s %-*.*s\n", printf("%-*s %-*s %-*.*s\n",