Hans Joachim Desserud has proposed merging
lp:~widelands-dev/widelands/split-assert into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/split-assert/+merge/214432
Building current trunk with GCC 4.8, it will output the error message below for
nearly every file (I guess map.h is included a lot). This is rather annoying
and drowns out any other warnings. I've done the easy fix which is to simply
split it into two separate asserts. I don't know if this is a GCC-only issue or
whether other compilers curently complain about this too.
In file included from /usr/include/c++/4.8/cassert:43:0,
from /home/user/dev/conversion/src/manager.h:23,
from /home/user/dev/conversion/src/logic/map.h:37,
from /home/user/dev/conversion/src/logic/editor_game_base.h:32,
from
/home/user/dev/conversion/src/graphic/render/gamerenderer.cc:24:
/home/user/dev/conversion/src/logic/map.h: In member function
‘Widelands::Coords Widelands::Map::get_starting_pos(Widelands::Player_Number)
const’:
/home/user/dev/conversion/src/logic/map.h:184:12: warning: comparisons like
‘X<=Y<=Z’ do not have their mathematical meaning [-Wparentheses]
assert(1 <= p <= get_nrplayers());
^
--
https://code.launchpad.net/~widelands-dev/widelands/split-assert/+merge/214432
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/split-assert into lp:widelands.
=== modified file 'src/logic/map.h'
--- src/logic/map.h 2014-04-04 10:11:02 +0000
+++ src/logic/map.h 2014-04-06 12:06:51 +0000
@@ -179,7 +179,8 @@
void set_starting_pos(Player_Number, Coords);
Coords get_starting_pos(Player_Number const p) const {
- assert(1 <= p <= get_nrplayers());
+ assert(1 <= p);
+ assert(p <= get_nrplayers());
return m_starting_pos[p - 1];
}
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
