diff options
| author |   David Seifert <soap@gentoo.org> | 2016-12-17 11:36:47 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-12-17 11:37:07 +0100 |
| commit | 0455ee01fd7b958c9a36ae568b7cac0725416b9e (patch) | |
| tree | 9993e2388833ddc1ba2a419a2fb9489e6fa4e0a1 /games-strategy/warmux/files | |
| parent | net-analyzer/httping: amd64 stable wrt bug #602888 (diff) | |
| download | gentoo-0455ee01fd7b958c9a36ae568b7cac0725416b9e.tar.gz gentoo-0455ee01fd7b958c9a36ae568b7cac0725416b9e.tar.bz2 gentoo-0455ee01fd7b958c9a36ae568b7cac0725416b9e.zip | |
games-strategy/warmux: Fix building with GCC 6
Gentoo-bug: 598639
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'games-strategy/warmux/files')
| -rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch new file mode 100644 index 000000000000..223ee47ab5a2 --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch @@ -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); |