mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r13351) -Codechange: disable warnings about unused variable for builds without asserts

This commit is contained in:
smatz 2008-06-01 15:08:14 +00:00
parent 10d6f6c5b8
commit ed462507b2
6 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.lib
View File

@ -936,6 +936,10 @@ make_cflags_and_ldflags() {
if [ $cc_version -ge 30 ]; then
CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
CFLAGS="$CFLAGS -Wredundant-decls"
# Do not warn about unused variables when building without asserts
if [ $enable_assert -eq 0 ]; then
CFLAGS="$CFLAGS -Wno-unused-variable"
fi
fi
if [ $cc_version -ge 34 ]; then

7
src/blitter/factory.hpp
View File

@ -43,11 +43,8 @@ protected:
if (name == NULL) return;
this->name = strdup(name);
#if !defined(NDEBUG) || defined(WITH_ASSERT)
/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
std::pair<Blitters::iterator, bool> P =
#endif /* !NDEBUG */
GetBlitters().insert(Blitters::value_type(name, this));
std::pair<Blitters::iterator, bool> P = GetBlitters().insert(Blitters::value_type(name, this));
assert(P.second);
}

6
src/driver.cpp
View File

@ -156,11 +156,7 @@ void DriverFactoryBase::RegisterDriver(const char *name, Driver::Type type, int
strecpy(buf, GetDriverTypeName(type), lastof(buf));
strecpy(buf + 5, name, lastof(buf));
#if !defined(NDEBUG) || defined(WITH_ASSERT)
/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
std::pair<Drivers::iterator, bool> P =
#endif /* !NDEBUG */
GetDrivers().insert(Drivers::value_type(buf, this));
std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(buf, this));
assert(P.second);
}

4
src/gfxinit.cpp
View File

@ -71,12 +71,8 @@ void LoadSpritesIndexed(int file_index, uint *sprite_id, const SpriteID *index_t
uint end = *index_tbl++;
do {
#ifdef NDEBUG
LoadNextSprite(start, file_index, *sprite_id);
#else
bool b = LoadNextSprite(start, file_index, *sprite_id);
assert(b);
#endif
(*sprite_id)++;
} while (++start <= end);
}

12
src/newgrf_engine.cpp
View File

@ -886,23 +886,19 @@ SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction dire
SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle *v, bool info_view)
{
#if !defined(NDEBUG) || defined(WITH_ASSERT)
const Engine *e = GetEngine(engine);
#endif /* !defined(NDEBUG) || defined(WITH_ASSERT) */
const SpriteGroup *group;
ResolverObject object;
assert(e->type == VEH_AIRCRAFT);
/* Only valid for helicopters */
assert(e->type == VEH_AIRCRAFT);
assert(!(e->u.air.subtype & AIR_CTOL));
ResolverObject object;
NewVehicleResolver(&object, engine, v);
object.info_view = info_view;
group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
const SpriteGroup *group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
group = Resolve(group, &object);
if (group == NULL || group->type != SGT_RESULT) return 0;

6
src/town_cmd.cpp
View File

@ -1639,11 +1639,7 @@ HouseZonesBits GetTownRadiusGroup(const Town *t, TileIndex tile)
*/
static inline void ClearMakeHouseTile(TileIndex tile, TownID tid, byte counter, byte stage, HouseID type, byte random_bits)
{
#if !defined(NDEBUG) || defined(WITH_ASSERT)
CommandCost cc =
#endif /* !defined(NDEBUG) || defined(WITH_ASSERT) */
DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR);
CommandCost cc = DoCommand(tile, 0, 0, DC_EXEC | DC_AUTO | DC_NO_WATER, CMD_LANDSCAPE_CLEAR);
assert(CmdSucceeded(cc));