added assignment operators from int for disambiguation of expressions such as ll=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -134,6 +134,8 @@ public:
|
|||||||
wxLongLongNative& operator=(wxULongLong_t ll)
|
wxLongLongNative& operator=(wxULongLong_t ll)
|
||||||
{ m_ll = ll; return *this; }
|
{ m_ll = ll; return *this; }
|
||||||
wxLongLongNative& operator=(const wxULongLongNative &ll);
|
wxLongLongNative& operator=(const wxULongLongNative &ll);
|
||||||
|
wxLongLongNative& operator=(int l)
|
||||||
|
{ m_ll = l; return *this; }
|
||||||
wxLongLongNative& operator=(long l)
|
wxLongLongNative& operator=(long l)
|
||||||
{ m_ll = l; return *this; }
|
{ m_ll = l; return *this; }
|
||||||
wxLongLongNative& operator=(unsigned long l)
|
wxLongLongNative& operator=(unsigned long l)
|
||||||
@@ -365,6 +367,8 @@ public:
|
|||||||
{ m_ll = ll; return *this; }
|
{ m_ll = ll; return *this; }
|
||||||
wxULongLongNative& operator=(wxLongLong_t ll)
|
wxULongLongNative& operator=(wxLongLong_t ll)
|
||||||
{ m_ll = ll; return *this; }
|
{ m_ll = ll; return *this; }
|
||||||
|
wxULongLongNative& operator=(int l)
|
||||||
|
{ m_ll = l; return *this; }
|
||||||
wxULongLongNative& operator=(long l)
|
wxULongLongNative& operator=(long l)
|
||||||
{ m_ll = l; return *this; }
|
{ m_ll = l; return *this; }
|
||||||
wxULongLongNative& operator=(unsigned long l)
|
wxULongLongNative& operator=(unsigned long l)
|
||||||
@@ -606,6 +610,12 @@ public:
|
|||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
// from int
|
||||||
|
wxLongLongWx& operator=(int l)
|
||||||
|
{
|
||||||
|
return operator=((long)l);
|
||||||
|
}
|
||||||
|
|
||||||
wxLongLongWx& operator=(unsigned long l)
|
wxLongLongWx& operator=(unsigned long l)
|
||||||
{
|
{
|
||||||
m_lo = l;
|
m_lo = l;
|
||||||
|
Reference in New Issue
Block a user