(svn r10561) -Fix: don't give 'unused variable' warnings when disabling asserts
--- a/src/blitter/factory.hpp Sat Jul 14 17:32:50 2007 +0000
+++ b/src/blitter/factory.hpp Sat Jul 14 20:21:02 2007 +0000
@@ -39,7 +39,11 @@
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);
}
--- a/src/driver.h Sat Jul 14 17:32:50 2007 +0000
+++ b/src/driver.h Sat Jul 14 20:21:02 2007 +0000
@@ -79,7 +79,11 @@
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);
}