cpp/openttd-patchpack/source Changeset - r9436:8c85322a3b2a

Changeset - r9436:8c85322a3b2a

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

smatz - 16 years ago 2008-06-01 15:08:14
smatz@openttd.org

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

6 files changed with 12 insertions and 27 deletions:

config.lib

src/blitter/factory.hpp

src/driver.cpp

src/gfxinit.cpp

src/newgrf_engine.cpp

src/town_cmd.cpp

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -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

src/blitter/factory.hpp

➞

Show inline comments

@@ @@ -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);
+	}

src/driver.cpp

➞

Show inline comments

@@ @@ -156,11 +156,7 @@ void DriverFactoryBase::RegisterDriver(c @@
 	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);
+}

src/gfxinit.cpp

➞

Show inline comments

@@ @@ -71,12 +71,8 @@ void LoadSpritesIndexed(int file_index, @@
 		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);
+	}

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -886,23 +886,19 @@ SpriteID GetCustomEngineSprite(EngineID @@
 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;

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -1639,11 +1639,7 @@ HouseZonesBits GetTownRadiusGroup(const @@
  */
 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));

0 comments (0 inline, 0 general)