[Scummvm-cvs-logs] SF.net SVN: scummvm:[45415] scummvm/trunk/engines/tinsel/heapmem.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Oct 26 21:08:33 CET 2009


Revision: 45415
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45415&view=rev
Author:   lordhoto
Date:     2009-10-26 20:08:33 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Change assert parameter to match the comment above it.

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/heapmem.cpp

Modified: scummvm/trunk/engines/tinsel/heapmem.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/heapmem.cpp	2009-10-26 20:07:37 UTC (rev 45414)
+++ scummvm/trunk/engines/tinsel/heapmem.cpp	2009-10-26 20:08:33 UTC (rev 45415)
@@ -452,9 +452,8 @@
 	assert(size);
 
 	if (size != pMemNode->size) {
-
 		// make sure memory object is not locked and discarded
-		assert(pMemNode->flags == (DWM_LOCKED | DWM_DISCARDED));
+		assert(!(pMemNode->flags & DWM_LOCKED) && (pMemNode->flags & DWM_DISCARDED));
 		assert(pMemNode->size == 0);
 
 		// unlink the mnode from the current heap


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list