From 4342798ff5100c8b5974c8c41c7b4f667f09883d Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 25 Dec 2016 13:26:15 +0000
Subject: (svn r27709) -Fix-ish: Silence some warnings. (adf88)

---
 config.lib                | 3 +++
 src/saveload/saveload.cpp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/config.lib b/config.lib
index bf52a94c1..196e908f5 100644
--- a/config.lib
+++ b/config.lib
@@ -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
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 87df2c3a6..fcda489fa 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -1484,6 +1484,8 @@ size_t SlCalcObjMemberLength(const void *object, const SaveLoad *sld)
 	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 SaveLoad *sld)
 	}
 }
 
+#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) {
-- 
cgit v1.2.3-54-g00ecf