From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 Nov 2011 19:50:01 +0000 (+0000)
Subject: Correct wxTLS_PTR definition for !wxHAS_COMPILER_TLS case.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e76e89aabe37dce8a72165349d90d1fad8488da0?ds=inline

Correct wxTLS_PTR definition for !wxHAS_COMPILER_TLS case.

wxTLS_PTR should have type of "T*" instead of being simply usable as "T*"
because of its overloaded operator->(), otherwise the code relying on it being
"T*" and compiling without problems in wxHAS_COMPILER_TLS case could fail to
compile without compiler TLS support.

Closes #13644.

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

diff --git a/include/wx/tls.h b/include/wx/tls.h
index f91368d503..996fa251dd 100644
--- a/include/wx/tls.h
+++ b/include/wx/tls.h
@@ -132,7 +132,7 @@
     };
 
     #define wxTLS_TYPE(T) wxTlsValue<T>
-    #define wxTLS_PTR(var) (var)
+    #define wxTLS_PTR(var) ((var).Get())
     #define wxTLS_VALUE(var) (*(var))
 #endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS