From 5294efe6794ce0a25052af524f26d4aa4e17ccba Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 20 Mar 2006 01:26:13 +0000 Subject: [PATCH] USE_MEMORY_NOWRAPPERS --- panda/src/downloader/httpChannel.cxx | 2 +- panda/src/express/virtualFileMount.cxx | 2 +- panda/src/express/virtualFileSystem.cxx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panda/src/downloader/httpChannel.cxx b/panda/src/downloader/httpChannel.cxx index af44780713..eaec9ebdc7 100644 --- a/panda/src/downloader/httpChannel.cxx +++ b/panda/src/downloader/httpChannel.cxx @@ -190,7 +190,7 @@ close_read_file(istream *stream) const { // the stream pointer does not call the appropriate global delete // function; instead apparently calling the system delete // function. So we call the delete function by hand instead. -#ifndef NDEBUG +#ifndef USE_MEMORY_NOWRAPPERS stream->~istream(); (*global_operator_delete)(stream); #else diff --git a/panda/src/express/virtualFileMount.cxx b/panda/src/express/virtualFileMount.cxx index 5176198b08..768efa2a25 100644 --- a/panda/src/express/virtualFileMount.cxx +++ b/panda/src/express/virtualFileMount.cxx @@ -46,7 +46,7 @@ close_read_file(istream *stream) const { // the stream pointer does not call the appropriate global delete // function; instead apparently calling the system delete // function. So we call the delete function by hand instead. -#ifndef NDEBUG +#ifndef USE_MEMORY_NOWRAPPERS stream->~istream(); (*global_operator_delete)(stream); #else diff --git a/panda/src/express/virtualFileSystem.cxx b/panda/src/express/virtualFileSystem.cxx index db2fa9d8bc..359c674eb5 100644 --- a/panda/src/express/virtualFileSystem.cxx +++ b/panda/src/express/virtualFileSystem.cxx @@ -605,12 +605,12 @@ close_read_file(istream *stream) const { // the stream pointer does not call the appropriate global delete // function; instead apparently calling the system delete // function. So we call the delete function by hand instead. - #ifndef NDEBUG +#ifndef USE_MEMORY_NOWRAPPERS stream->~istream(); (*global_operator_delete)(stream); - #else +#else delete stream; - #endif +#endif } }