From 88f87760b80023e6c5be3e452b73ffb3a594ca43 Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Tue, 14 Nov 2006 04:02:05 +0000 Subject: [PATCH] memoryInfo fix for debug builds --- panda/src/express/dcast.cxx | 2 +- panda/src/express/memoryInfo.cxx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/panda/src/express/dcast.cxx b/panda/src/express/dcast.cxx index 559dbd068f..d4352aa6f2 100644 --- a/panda/src/express/dcast.cxx +++ b/panda/src/express/dcast.cxx @@ -20,7 +20,7 @@ #include "config_express.h" #ifdef _WIN32 -#include // for IsBadWritePtr() +//#include // for IsBadWritePtr() #endif diff --git a/panda/src/express/memoryInfo.cxx b/panda/src/express/memoryInfo.cxx index 8093128193..003368399f 100644 --- a/panda/src/express/memoryInfo.cxx +++ b/panda/src/express/memoryInfo.cxx @@ -171,7 +171,6 @@ update_type_handle(TypeHandle &destination, TypeHandle refined) { } else { // Unrelated types, which might or might not be a problem. - destination = refined; return false; }