don't use new string caching code without compiler TLS support (temporary fix to...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 50c4cc929614ae02c6700e7f4d960b0a72aaf222..845316e8835da9ee815e689270367cda79c0dd93 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -75,6 +75,12 @@
     #define wxUSE_STRING_POS_CACHE 0
 #endif
 
+#ifndef wxHAS_COMPILER_TLS
+    // FIXME: currently the code only works with compiler TLS support
+    #undef wxUSE_STRING_POS_CACHE
+    #define wxUSE_STRING_POS_CACHE 0
+#endif
+
 #if wxUSE_STRING_POS_CACHE
     #include "wx/tls.h"