Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-17 08:59:13 +00:00
parent 152442d40d
commit ea412ac4eb
2 changed files with 13 additions and 9 deletions
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -224,15 +224,15 @@ wxAny wxVariant::GetAny() const
    wxAny any;

    if ( IsNull() )
-        return wxAny((const wxAny&)any);
+        return any;

    wxVariantData* data = GetData();

    if ( data->GetAsAny(&any) )
-        return wxAny((const wxAny&)any);
+        return any;

    // If everything else fails, wrap the whole wxVariantData
-    return wxAny(((wxVariantData*)data));
+    return wxAny(data);
 }

 #endif // wxUSE_ANY