1*06494426SHerbert Dürr--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2013-05-27 11:54:18.432327600 +0200 2*06494426SHerbert Dürr+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2013-05-27 11:52:02.662562100 +0200 3*06494426SHerbert Dürr@@ -869,7 +869,7 @@ 4*06494426SHerbert Dürr 5*06494426SHerbert Dürr } // namespace gr 6*06494426SHerbert Dürr 7*06494426SHerbert Dürr-template stdext::hash_map< 8*06494426SHerbert Dürr+template hashmap_ns::hash_map< 9*06494426SHerbert Dürr gr::WinFont::LogFontWrapper, 10*06494426SHerbert Dürr gr::WinFont::FontHandleCache::FontCacheValue, 11*06494426SHerbert Dürr gr::WinFont::LogFontHashFuncs>; 12*06494426SHerbert Dürr--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h 2013-05-27 11:56:04.110372100 +0200 13*06494426SHerbert Dürr+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h 2013-05-27 11:55:56.412931800 +0200 14*06494426SHerbert Dürr@@ -28,8 +28,12 @@ 15*06494426SHerbert Dürr #include "Font.h" 16*06494426SHerbert Dürr #include <map> 17*06494426SHerbert Dürr 18*06494426SHerbert Dürr-#ifdef _STLPORT_VERSION 19*06494426SHerbert Dürr-namespace stdext = _STLP_STD; 20*06494426SHerbert Dürr+#ifdef SYSTEM_STL_HASHMAP 21*06494426SHerbert Dürr+namespace hashmap_ns = std; 22*06494426SHerbert Dürr+#elif defined(_STLPORT_VERSION) 23*06494426SHerbert Dürr+namespace hashmap_ns = _STLP_STD; 24*06494426SHerbert Dürr+#else 25*06494426SHerbert Dürr+namespace hashmap_ns = stdext; 26*06494426SHerbert Dürr #endif 27*06494426SHerbert Dürr 28*06494426SHerbert Dürr namespace gr 29*06494426SHerbert Dürr@@ -212,7 +216,7 @@ 30*06494426SHerbert Dürr FontCacheValue GetCache(LOGFONT & lf); 31*06494426SHerbert Dürr void DeleteFont(HFONT hfont); 32*06494426SHerbert Dürr 33*06494426SHerbert Dürr- typedef stdext::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap; 34*06494426SHerbert Dürr+ typedef hashmap_ns::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap; 35*06494426SHerbert Dürr 36*06494426SHerbert Dürr protected: 37*06494426SHerbert Dürr FontHandleHashMap m_hmlffcv; 38*06494426SHerbert Dürr--- misc/silgraphite-2.3.1/engine/include/graphite/GrCommon.h 2013-05-27 15:10:31.799725700 +0200 39*06494426SHerbert Dürr+++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrCommon.h 2013-05-27 15:10:19.387015800 +0200 40*06494426SHerbert Dürr@@ -18,8 +18,8 @@ 41*06494426SHerbert Dürr #ifndef GRCOMMON_INCLUDED 42*06494426SHerbert Dürr #define GRCOMMON_INCLUDED 43*06494426SHerbert Dürr 44*06494426SHerbert Dürr-#define _SECURE_SCL 0 // to allow GlyphSetIterator to work, which points off the end of a vector 45*06494426SHerbert Dürr-#define _HAS_ITERATOR_DEBUGGING 0 46*06494426SHerbert Dürr+//#define _SECURE_SCL 0 // to allow GlyphSetIterator to work, which points off the end of a vector 47*06494426SHerbert Dürr+//#define _HAS_ITERATOR_DEBUGGING 0 48*06494426SHerbert Dürr 49*06494426SHerbert Dürr // Standard Headers. 50*06494426SHerbert Dürr 51