Handle wxLongLong wxConvertAnyToVariant only if wxUSE_LONGLONG==1.
Code responsible for handling wxLongLong datatype in wxConvertAnyToVariant() should be active only if wxUSE_LONGLONG is enabled. See #16939.
This commit is contained in:
committed by
Vadim Zeitlin
parent
d8922744cf
commit
01dde21e68
@@ -146,7 +146,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
|
||||
// and others to "longlong".
|
||||
if ( wxANY_CHECK_TYPE(any, signed int) )
|
||||
{
|
||||
#ifdef wxLongLong_t
|
||||
#if defined(wxLongLong_t) && wxUSE_LONGLONG
|
||||
wxLongLong_t ll = 0;
|
||||
if ( any.GetAs(&ll) )
|
||||
{
|
||||
@@ -264,7 +264,7 @@ bool wxAnyValueTypeImplInt::ConvertValue(const wxAnyValueBuffer& src,
|
||||
wxAnyBaseIntType value = GetValue(src);
|
||||
if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
|
||||
{
|
||||
#ifdef wxLongLong_t
|
||||
#if defined(wxLongLong_t) && wxUSE_LONLONG
|
||||
wxLongLong ll(value);
|
||||
wxString s = ll.ToString();
|
||||
#else
|
||||
@@ -302,7 +302,7 @@ bool wxAnyValueTypeImplUint::ConvertValue(const wxAnyValueBuffer& src,
|
||||
wxAnyBaseUintType value = GetValue(src);
|
||||
if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
|
||||
{
|
||||
#ifdef wxLongLong_t
|
||||
#if defined(wxLongLong_t) && wxUSE_LONGLONG
|
||||
wxULongLong ull(value);
|
||||
wxString s = ull.ToString();
|
||||
#else
|
||||
|
Reference in New Issue
Block a user