Browse Source

USE_MEMORY_NOWRAPPERS

David Rose 20 years ago
parent
commit
5294efe679

+ 1 - 1
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

+ 1 - 1
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

+ 3 - 3
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
   }
 }