cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/warmux: Fix build with Clang 6

Browse Source 
interface/weapon_menu.cpp:394:12: error: cannot initialize return object of type 'Weapon *' with an rvalue of type 'bool'
    return false;
           ^~~~~

http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/warmux-11.04.1_9.log

map/tile.cpp:676:30: error: non-constant-expression cannot be narrowed from type
      'uint' (aka 'unsigned int') to 'uint16_t' (aka 'unsigned short') in initializer
      list [-Wc++11-narrowing]
      SynchTileInfo info = { i, t->GetSynchsum() };
                             ^
This commit is contained in:
Tobias Kortkamp 2018-07-30 11:05:18 +00:00
parent 1ea6d09b08
commit 4f6bece540
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=475879
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
games/warmux/Makefile
View File

@ -19,10 +19,13 @@ LIB_DEPENDS= libxml++-2.6.so:textproc/libxml++26 \
GNU_CONFIGURE= yes
CONFIGURE_ENV= cxx_present=yes
USES= dos2unix gmake pkgconfig tar:bzip2
USES= compiler dos2unix gmake pkgconfig tar:bzip2
USE_SDL= sdl image mixer ttf gfx net
DOS2UNIX_GLOB= fixed_class.h
# build ignores CXXFLAGS
CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
CFLAGS_clang= -Wno-c++11-narrowing
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:R}
OPTIONS_DEFINE= FRIBIDI SERVER NLS DEBUG

15
games/warmux/files/patch-src_interface_weapon__menu.cpp Normal file
View File

@ -0,0 +1,15 @@
interface/weapon_menu.cpp:394:12: error: cannot initialize return object of type 'Weapon *' with an rvalue of type 'bool'
return false;
^~~~~
--- src/interface/weapon_menu.cpp.orig 2018-07-30 10:50:34 UTC
+++ src/interface/weapon_menu.cpp
@@ -391,7 +391,7 @@ void WeaponsMenu::Draw()
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);