]> git.saurik.com Git - wxWidgets.git/commitdiff
blind compilation fix for 64 bit systems after last commit
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 13 Feb 2006 00:26:33 +0000 (00:26 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 13 Feb 2006 00:26:33 +0000 (00:26 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/longlong.h

index 366ba7270f1e0267b5f60e4f4b80ce6679418912..5ceca3c77b012523757b8a30bd4183bd1d1ba0f7 100644 (file)
@@ -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)