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

diff --git a/include/wx/any.h b/include/wx/any.h
index e20ab0e78df35700c2066279cb511da3f2825615..91b1abf0f94f213beb524448969727da08ca9607 100644 (file)
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -679,11 +679,19 @@ public:
     /**
         Various constructors.
     */
     /**
         Various constructors.
     */

+    template<typename T>
+    wxAny(const T& value)
+    {
+        m_type = wxAnyValueTypeImpl<T>::sm_instance;
+        wxAnyValueTypeImpl<T>::SetValue(value, m_buffer);
+    }
+

     wxAny(const char* value)
     {
         m_type = wxAnyNullValueType;
         Assign(wxString(value));
     }
     wxAny(const char* value)
     {
         m_type = wxAnyNullValueType;
         Assign(wxString(value));
     }

+

     wxAny(const wchar_t* value)
     {
         m_type = wxAnyNullValueType;
     wxAny(const wchar_t* value)
     {
         m_type = wxAnyNullValueType;


@@ -697,6 +705,7 @@ public:
     }
 
 #if wxUSE_VARIANT
     }
 
 #if wxUSE_VARIANT

+    template<>

     wxAny(const wxVariant& variant)
     {
         m_type = wxAnyNullValueType;
     wxAny(const wxVariant& variant)
     {
         m_type = wxAnyNullValueType;


@@ -704,12 +713,6 @@ public:
     }
 #endif
 
     }
 #endif
 

-    template<typename T>
-    wxAny(const T& value)
-    {
-        m_type = wxAnyValueTypeImpl<T>::sm_instance;
-        wxAnyValueTypeImpl<T>::SetValue(value, m_buffer);
-    }

     //@}
 
     /**
     //@}
 
     /**


@@ -914,6 +917,7 @@ public:
 
 #if wxUSE_VARIANT
     // GetAs() wxVariant specialization
 
 #if wxUSE_VARIANT
     // GetAs() wxVariant specialization

+    template<>

     bool GetAs(wxVariant* value) const
     {
         return wxConvertAnyToVariant(*this, value);
     bool GetAs(wxVariant* value) const
     {
         return wxConvertAnyToVariant(*this, value);

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 86c60ec187fe78c0516c11f31f173af40853d360..57aba64bb1d84925d12e6a109239292675359905 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -224,15 +224,15 @@ wxAny wxVariant::GetAny() const
     wxAny any;
 
     if ( IsNull() )
     wxAny any;
 
     if ( IsNull() )

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

 
     wxVariantData* data = GetData();
 
     if ( data->GetAsAny(&any) )
 
     wxVariantData* data = GetData();
 
     if ( data->GetAsAny(&any) )

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

 
     // If everything else fails, wrap the whole wxVariantData
 
     // If everything else fails, wrap the whole wxVariantData

-    return wxAny(((wxVariantData*)data));
+    return wxAny(data);

 }
 
 #endif // wxUSE_ANY
 }
 
 #endif // wxUSE_ANY