From 38b2e0de1806b8c5e723cdd04d20ce2b911ed5c4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 13 Feb 2006 00:26:33 +0000 Subject: [PATCH] blind compilation fix for 64 bit systems after last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/longlong.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wx/longlong.h b/include/wx/longlong.h index 366ba7270f..5ceca3c77b 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -129,10 +129,12 @@ public: // assignment operators // from native 64 bit integer +#ifndef wxLongLongIsLong wxLongLongNative& operator=(wxLongLong_t ll) { m_ll = ll; return *this; } wxLongLongNative& operator=(wxULongLong_t ll) { m_ll = ll; return *this; } +#endif // !wxLongLongNative wxLongLongNative& operator=(const wxULongLongNative &ll); wxLongLongNative& operator=(int l) { m_ll = l; return *this; } @@ -363,10 +365,12 @@ public: // assignment operators // from native 64 bit integer +#ifndef wxLongLongIsLong wxULongLongNative& operator=(wxULongLong_t ll) { m_ll = ll; return *this; } wxULongLongNative& operator=(wxLongLong_t ll) { m_ll = ll; return *this; } +#endif // !wxLongLongNative wxULongLongNative& operator=(int l) { m_ll = l; return *this; } wxULongLongNative& operator=(long l) -- 2.45.2