Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #906 due to strange crash, we remove the stl xml allocator

Browse source
This commit is contained in:
vl 2010-05-22 08:54:18 +02:00
parent 7ca5eea749
commit 962491b33d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/ryzom/client/src/init.cpp
View file

@ -167,8 +167,8 @@ uint TipsOfTheDayIndex;
// XML allocator functions // XML allocator functions
// Due to Bug #906, we disable the stl xml allocation
/*
static volatile bool XmlAllocUsesSTL = true; static volatile bool XmlAllocUsesSTL = true;
static std::allocator<uint8> xmlStlAlloc; static std::allocator<uint8> xmlStlAlloc;
@ -236,7 +236,7 @@ char *XmlStrdup4NeL (const char *str)
strcpy (newStr, str); strcpy (newStr, str);
return newStr; return newStr;
} }
*/
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
@ -696,7 +696,8 @@ void prelogInit()
// _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF );
// Init XML Lib allocator // 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 // Init the debug memory
initDebugMemory(); initDebugMemory();