forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-strategy/warmux: Fix building with GCC 6
Gentoo-bug: 598639 Package-Manager: Portage-2.3.3, Repoman-2.3.1
- Loading branch information
1 parent
ba3180a
commit 0455ee0
Showing
2 changed files
with
26 additions
and
9 deletions.
There are no files selected for viewing
14 changes: 14 additions & 0 deletions
14
games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
In C++14, bool -> T* implicit conversions are not allowed anymore. | ||
See also: https://bugs.gentoo.org/show_bug.cgi?id=598639 | ||
|
||
--- a/src/interface/weapon_menu.cpp | ||
+++ b/src/interface/weapon_menu.cpp | ||
@@ -391,7 +391,7 @@ | ||
Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) | ||
{ | ||
if (!show) | ||
- return false; | ||
+ return NULL; | ||
const std::vector<PolygonItem *>& items = poly->GetItem(); | ||
WeaponMenuItem * tmp; | ||
Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters