|
@@ -30,8 +30,6 @@
|
|
#include "platform/threads/mutex.h"
|
|
#include "platform/threads/mutex.h"
|
|
#include "core/module.h"
|
|
#include "core/module.h"
|
|
|
|
|
|
-#if !defined(TORQUE_DISABLE_MEMORY_MANAGER)
|
|
|
|
-
|
|
|
|
#ifdef _WIN32
|
|
#ifdef _WIN32
|
|
#include <windows.h>
|
|
#include <windows.h>
|
|
#include <dbghelp.h>
|
|
#include <dbghelp.h>
|
|
@@ -42,8 +40,6 @@
|
|
#include <ctime>
|
|
#include <ctime>
|
|
#include <string>
|
|
#include <string>
|
|
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
// If profile paths are enabled, disable profiling of the
|
|
// If profile paths are enabled, disable profiling of the
|
|
// memory manager as that would cause a cyclic dependency
|
|
// memory manager as that would cause a cyclic dependency
|
|
// through the string table's allocation stuff used by the
|
|
// through the string table's allocation stuff used by the
|
|
@@ -181,11 +177,11 @@ namespace Memory
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
- if (report.find("getDocsLink") != std::string::npos)
|
|
|
|
- {
|
|
|
|
- //known issue. one off allocation
|
|
|
|
- memLog[curRep].skip = true;
|
|
|
|
- }
|
|
|
|
|
|
+ //if (report.find("getDocsLink") != std::string::npos)
|
|
|
|
+ //{
|
|
|
|
+ // //known issue. one off allocation
|
|
|
|
+ // memLog[curRep].skip = true;
|
|
|
|
+ //}
|
|
|
|
|
|
for (U32 oldRep = start; oldRep < curRep; ++oldRep)
|
|
for (U32 oldRep = start; oldRep < curRep; ++oldRep)
|
|
{
|
|
{
|