Changeset - r22502:3625e96bd0f3
[Not reviewed]
master
0 2 0
frosch - 8 years ago 2016-12-25 13:26:15
frosch@openttd.org
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
2 files changed with 9 insertions and 0 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -1404,6 +1404,9 @@ make_compiler_cflags() {
 
			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
 
			# They are valid according to the C++ standard, but useless.
 
			cxxflags="$cxxflags -Wno-narrowing"
 
		fi
 

	
 
		if [ $cc_version -ge 407 ]; then
 
			# Disable bogus 'attempt to free a non-heap object' warning
 
			flags="$flags -Wno-free-nonheap-object"
 
		fi
src/saveload/saveload.cpp
Show inline comments
 
@@ -1484,6 +1484,8 @@ size_t SlCalcObjMemberLength(const void 
 
	return 0;
 
}
 

	
 
#ifdef OTTD_ASSERT
 

	
 
/**
 
 * Check whether the variable size of the variable in the saveload configuration
 
 * matches with the actual variable size.
 
@@ -1524,9 +1526,13 @@ static bool IsVariableSizeRight(const Sa
 
	}
 
}
 

	
 
#endif /* OTTD_ASSERT */
 

	
 
bool SlObjectMember(void *ptr, const SaveLoad *sld)
 
{
 
#ifdef OTTD_ASSERT
 
	assert(IsVariableSizeRight(sld));
 
#endif
 

	
 
	VarType conv = GB(sld->conv, 0, 8);
 
	switch (sld->cmd) {
0 comments (0 inline, 0 general)