Fix wxAny for VC6 by removing 'wxAny& operator=(const wxVariant &variant)' for it. This will break some cases of implicit wxVariant->wxAny conversion (for VC6).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -772,7 +772,18 @@ public:
|
||||
return *this;
|
||||
}
|
||||
|
||||
#if wxUSE_VARIANT
|
||||
#if wxUSE_VARIANT && (!defined(__VISUALC__) || __VISUALC__ >= 1300)
|
||||
//
|
||||
// Adding this operator for VC6 breaks wxAny, and also
|
||||
// some cases of implicit conversion from wxVariant to wxAny.
|
||||
//
|
||||
// e.g. wxAny any = variant; // should work
|
||||
//
|
||||
// wxAny any;
|
||||
// any = 16;
|
||||
// any = variant; // probably doesn't work - uses template
|
||||
// // assignment, most likely
|
||||
//
|
||||
wxAny& operator=(const wxVariant &variant)
|
||||
{
|
||||
AssignVariant(variant);
|
||||
|
Reference in New Issue
Block a user