cpp/openttd-patchpack/source Changeset - r8051:d67dab6255c1

Changeset - r8051:d67dab6255c1

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

glx - 16 years ago 2007-12-09 21:20:21
glx@openttd.org

(svn r11611) -Codechange: it is now possible to use a define to enable asserts and show them in crash.log for MSVC release builds

4 files changed with 20 insertions and 2 deletions:

src/blitter/factory.hpp

src/driver.h

src/stdafx.h

src/win32.cpp

0 comments (0 inline, 0 general)

src/blitter/factory.hpp

➞

Show inline comments

@@ @@ -41,7 +41,7 @@ protected: @@
 		if (name == NULL) return;
 		this->name = strdup(name);
 #if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(WITH_ASSERT)
 		/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
 		std::pair<Blitters::iterator, bool> P =
 #endif /* !NDEBUG */

src/driver.h

➞

Show inline comments

@@ @@ -79,7 +79,7 @@ protected: @@
 		strecpy(buf, GetDriverTypeName(type), lastof(buf));
 		strecpy(buf + 5, name, lastof(buf));
 #if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(WITH_ASSERT)
 		/* NDEBUG disables asserts and gives a warning: unused variable 'P' */
 		std::pair<Drivers::iterator, bool> P =
 #endif /* !NDEBUG */

src/stdafx.h

➞

Show inline comments

@@ @@ -207,6 +207,13 @@ @@
 		#define strcasecmp stricmp
 		#define strncasecmp strnicmp
 	#endif
 	void SetExceptionString(const char* s, ...);
 	#if defined(NDEBUG) && defined(WITH_ASSERT)
 		#undef assert
 		#define assert(expression) if (!(expression)) { SetExceptionString("Assertion failed at %s:%d: %s", __FILE__, __LINE__, #expression); *(byte*)0 = 0; }
 	#endif
 #endif /* defined(_MSC_VER) */
 #if defined(WINCE)

src/win32.cpp

➞

Show inline comments

@@ @@ -81,6 +81,17 @@ bool LoadLibraryList(Function proc[], co @@
 #ifdef _MSC_VER
 static const char *_exception_string = NULL;
 void SetExceptionString(const char *s, ...)
+{
 	va_list va;
 	char buf[512];
 	va_start(va, s);
 	vsnprintf(buf, lengthof(buf), s, va);
 	va_end(va);
 	_exception_string = strdup(buf);
+}
 #endif
 void ShowOSErrorBox(const char *buf)

0 comments (0 inline, 0 general)