From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sun, 18 Apr 2010 11:54:53 +0000 (+0000)
Subject: Fix STL build
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/549d99f04372ef743bbea362c2f2fa582333b74c

Fix STL build

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

diff --git a/src/common/any.cpp b/src/common/any.cpp
index a1e21b57c2..282505fcf2 100644
--- a/src/common/any.cpp
+++ b/src/common/any.cpp
@@ -82,8 +82,15 @@ public:
 
     // Find wxVariantData factory function for given value type,
     // (or compatible, if possible)
-    wxVariantDataFactory FindVariantDataFactory(const wxAnyValueType* type)
+    wxVariantDataFactory FindVariantDataFactory(const wxAnyValueType* type_)
     {
+        // Ideally we'd have the hash map of type 'const wxAnyValueType*',
+        // but WX_DECLARE_HASH_MAP() has some trouble with it. Also note
+        // that we must use C-style cast here instead of e.g.
+        // static_cast<>, which can cause compiler to complain when
+        // casting away constness.
+        wxAnyValueType* type = (wxAnyValueType*)(type_);
+
         wxAnyTypeToVariantDataFactoryMap& anyToVariant = m_anyToVariant;
         wxAnyTypeToVariantDataFactoryMap::const_iterator it;
         it = anyToVariant.find(type);