diff -urN old/x64/src/allocators.cpp new/x64/src/allocators.cpp --- old/x64/src/allocators.cpp 2008-12-10 18:56:51.000000000 +0900 +++ new/x64/src/allocators.cpp 2011-09-10 17:17:16.464687500 +0900 @@ -680,7 +680,8 @@ // Detach list of chunks and free them all _Obj* __chunk = _S_chunks.clear(); while (__chunk != 0) { - _Obj* __next = __chunk->_M_next; + //_Obj* __next = __chunk->_M_next; + _Obj* __next = __chunk->Next; __stlp_delete_chunck(__chunk); __chunk = __next; } diff -urN old/x64/stlport/stl/_cstdlib.h new/x64/stlport/stl/_cstdlib.h --- old/x64/stlport/stl/_cstdlib.h 2008-12-10 18:56:51.000000000 +0900 +++ new/x64/stlport/stl/_cstdlib.h 2011-09-10 17:12:17.954613700 +0900 @@ -155,7 +155,7 @@ inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return ::lldiv(__x, __y); } # endif # else -inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; } +/* inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; } */ # endif #endif diff -urN old/x64/stlport/stl/config/host.h new/x64/stlport/stl/config/host.h --- old/x64/stlport/stl/config/host.h 2008-12-10 18:56:51.000000000 +0900 +++ new/x64/stlport/stl/config/host.h 2011-09-10 16:54:29.080477600 +0900 @@ -100,17 +100,17 @@ * its internal memory pool but only if STLport is used as a dynamic library * under Win32 (using MSVC like compilers). */ -/* + #define _STLP_LEAKS_PEDANTIC 1 -*/ + /* * Uncomment _STLP_USE_NEWALLOC to force allocator to use plain "new" * instead of STLport optimized node allocator engine. */ -/* + #define _STLP_USE_NEWALLOC 1 -*/ + /* * Uncomment _STLP_USE_MALLOC to force allocator to use plain "malloc" diff -urN old/x64/test/unit/ctype_facets_test.cpp new/x64/test/unit/ctype_facets_test.cpp --- old/x64/test/unit/ctype_facets_test.cpp 2008-12-10 18:56:51.000000000 +0900 +++ new/x64/test/unit/ctype_facets_test.cpp 2011-09-10 16:58:04.380792000 +0900 @@ -427,7 +427,7 @@ locale loc(locale::classic(), new ctype_byname("fr_FR")); CPPUNIT_ASSERT( has_facet >(loc) ); ctype const& ct = use_facet >(loc); - CPPUNIT_ASSERT( ct.is(ctype_base::mask(ctype_base::print | ctype_base::lower | ctype_base::alpha), 'ç') ); + CPPUNIT_ASSERT( ct.is(ctype_base::mask(ctype_base::print | ctype_base::lower | ctype_base::alpha), 0xE7) ); } catch (runtime_error const& /* e */) { //CPPUNIT_MESSAGE( e.what() ); diff -urN old/x86/stlport/stl/_cstdlib.h new/x86/stlport/stl/_cstdlib.h --- old/x86/stlport/stl/_cstdlib.h 2008-12-10 18:56:51.000000000 +0900 +++ new/x86/stlport/stl/_cstdlib.h 2011-09-10 17:11:54.022244800 +0900 @@ -155,7 +155,7 @@ inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return ::lldiv(__x, __y); } # endif # else -inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; } +/* inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; } */ # endif #endif diff -urN old/x86/stlport/stl/config/host.h new/x86/stlport/stl/config/host.h --- old/x86/stlport/stl/config/host.h 2008-12-10 18:56:51.000000000 +0900 +++ new/x86/stlport/stl/config/host.h 2011-09-10 16:54:05.842148400 +0900 @@ -100,17 +100,17 @@ * its internal memory pool but only if STLport is used as a dynamic library * under Win32 (using MSVC like compilers). */ -/* + #define _STLP_LEAKS_PEDANTIC 1 -*/ + /* * Uncomment _STLP_USE_NEWALLOC to force allocator to use plain "new" * instead of STLport optimized node allocator engine. */ -/* + #define _STLP_USE_NEWALLOC 1 -*/ + /* * Uncomment _STLP_USE_MALLOC to force allocator to use plain "malloc" diff -urN old/x86/test/unit/ctype_facets_test.cpp new/x86/test/unit/ctype_facets_test.cpp --- old/x86/test/unit/ctype_facets_test.cpp 2008-12-10 18:56:51.000000000 +0900 +++ new/x86/test/unit/ctype_facets_test.cpp 2011-09-10 16:57:17.591115800 +0900 @@ -427,7 +427,7 @@ locale loc(locale::classic(), new ctype_byname("fr_FR")); CPPUNIT_ASSERT( has_facet >(loc) ); ctype const& ct = use_facet >(loc); - CPPUNIT_ASSERT( ct.is(ctype_base::mask(ctype_base::print | ctype_base::lower | ctype_base::alpha), 'ç') ); + CPPUNIT_ASSERT( ct.is(ctype_base::mask(ctype_base::print | ctype_base::lower | ctype_base::alpha), 0xE7) ); } catch (runtime_error const& /* e */) { //CPPUNIT_MESSAGE( e.what() );