(svn r10561) -Fix: don't give 'unused variable' warnings when disabling asserts

2 files changed, 10 insertions, 2 deletions

diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp
index 8f289c2ce..beb35cba5 100644
--- a/src/blitter/factory.hpp
+++ b/src/blitter/factory.hpp
@@ -39,7 +39,11 @@ protected:
 		if (name == NULL) return;
 
 		this->name = strdup(name);
-		std::pair<Blitters::iterator, bool> P = GetBlitters().insert(Blitters::value_type(name, this));
+#if !defined(NDEBUG)
+		/* 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));
 		assert(P.second);
 	}
 
diff --git a/src/driver.h b/src/driver.h
index a57e62459..fa16cd24c 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -79,7 +79,11 @@ protected:
 		strecpy(buf, GetDriverTypeName(type), lastof(buf));
 		strecpy(buf + 5, name, lastof(buf));
 
-		std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(buf, this));
+#if !defined(NDEBUG)
+		/* 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));
 		assert(P.second);
 	}