From 962491b33d2f2ace1d9f86c0bfa2b50a54bd2546 Mon Sep 17 00:00:00 2001 From: vl Date: Sat, 22 May 2010 08:54:18 +0200 Subject: [PATCH] Changed: #906 due to strange crash, we remove the stl xml allocator --- code/ryzom/client/src/init.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index 149a8fbda..721897fda 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -167,8 +167,8 @@ uint TipsOfTheDayIndex; // XML allocator functions - - +// Due to Bug #906, we disable the stl xml allocation +/* static volatile bool XmlAllocUsesSTL = true; static std::allocator xmlStlAlloc; @@ -236,7 +236,7 @@ char *XmlStrdup4NeL (const char *str) strcpy (newStr, str); return newStr; } - +*/ #ifdef NL_OS_WINDOWS @@ -696,7 +696,8 @@ void prelogInit() // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); // Init XML Lib allocator - nlverify (xmlMemSetup (XmlFree4NeL, XmlMalloc4NeL, XmlRealloc4NeL, XmlStrdup4NeL) == 0); + // Due to Bug #906, we disable the stl xml allocation + // nlverify (xmlMemSetup (XmlFree4NeL, XmlMalloc4NeL, XmlRealloc4NeL, XmlStrdup4NeL) == 0); // Init the debug memory initDebugMemory();