fixed Cygwin compilation (there's no _get_osfhandle)

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 9b4a3149294f2a40376dfe0918d3748debc03cc7..62d28c53c327ee3bdabb254f5ee8387bc02e1198 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -47,7 +47,7 @@
         #pragma warning "Your compiler does not appear to support 64 bit "\
                         "integers, using emulation class instead.\n" \
                         "Please report your compiler version to " \
         #pragma warning "Your compiler does not appear to support 64 bit "\
                         "integers, using emulation class instead.\n" \
                         "Please report your compiler version to " \

-                        "wx-dev@lists.wxwindows.org!"
+                        "wx-dev@lists.wxwidgets.org!"

     #endif
 
     #define wxUSE_LONGLONG_WX 1
     #endif
 
     #define wxUSE_LONGLONG_WX 1


@@ -115,6 +115,9 @@ public:
         m_ll = ((wxLongLong_t) hi) << 32;
         m_ll |= (wxLongLong_t) lo;
     }
         m_ll = ((wxLongLong_t) hi) << 32;
         m_ll |= (wxLongLong_t) lo;
     }

+#if wxUSE_LONGLONG_WX
+    wxLongLongNative(wxLongLongWx ll);
+#endif

 
     // default copy ctor is ok
 
 
     // default copy ctor is ok
 


@@ -124,6 +127,10 @@ public:
         // from native 64 bit integer
     wxLongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }
         // from native 64 bit integer
     wxLongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }

+#if wxUSE_LONGLONG_WX
+    wxLongLongNative& operator=(wxLongLongWx ll);
+#endif
+

 
         // from double: this one has an explicit name because otherwise we
         // would have ambiguity with "ll = int" and also because we don't want
 
         // from double: this one has an explicit name because otherwise we
         // would have ambiguity with "ll = int" and also because we don't want


@@ -294,9 +301,13 @@ public:
 
 #if wxUSE_STD_IOSTREAM
         // input/output
 
 #if wxUSE_STD_IOSTREAM
         // input/output

-    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);

 #endif
 
 #endif
 

+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxLongLongNative&);
+

 private:
     wxLongLong_t  m_ll;
 };
 private:
     wxLongLong_t  m_ll;
 };


@@ -477,9 +488,13 @@ public:
 
 #if wxUSE_STD_IOSTREAM
         // input/output
 
 #if wxUSE_STD_IOSTREAM
         // input/output

-    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&);

 #endif
 
 #endif
 

+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxULongLongNative&);
+

 private:
     unsigned wxLongLong_t  m_ll;
 };
 private:
     unsigned wxLongLong_t  m_ll;
 };


@@ -623,6 +638,10 @@ public:
     // comparison
     bool operator==(const wxLongLongWx& ll) const
         { return m_lo == ll.m_lo && m_hi == ll.m_hi; }
     // comparison
     bool operator==(const wxLongLongWx& ll) const
         { return m_lo == ll.m_lo && m_hi == ll.m_hi; }

+#if wxUSE_LONGLONG_NATIVE
+    bool operator==(const wxLongLongNative& ll) const
+        { return m_lo == ll.GetLo() && m_hi == ll.GetHi(); }
+#endif

     bool operator!=(const wxLongLongWx& ll) const
         { return !(*this == ll); }
     bool operator<(const wxLongLongWx& ll) const;
     bool operator!=(const wxLongLongWx& ll) const
         { return !(*this == ll); }
     bool operator<(const wxLongLongWx& ll) const;


@@ -665,9 +684,13 @@ public:
     void *asArray() const;
 
 #if wxUSE_STD_IOSTREAM
     void *asArray() const;
 
 #if wxUSE_STD_IOSTREAM

-    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);
+    friend WXDLLIMPEXP_BASE
+    wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);

 #endif // wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_STD_IOSTREAM
 

+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxLongLongWx&);
+

 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 


@@ -717,6 +740,14 @@ public:
 #endif // wxLONGLONG_TEST_MODE
     }
 
 #endif // wxLONGLONG_TEST_MODE
     }
 

+    // from signed to unsigned
+    wxULongLongWx(wxLongLongWx ll)
+    {
+        wxASSERT(ll.GetHi() >= 0);
+        m_hi = (unsigned long)ll.GetHi();
+        m_lo = ll.GetLo();
+    }
+

     // default copy ctor is ok in both cases
 
     // no dtor
     // default copy ctor is ok in both cases
 
     // no dtor


@@ -767,8 +798,8 @@ public:
         // post increment operator
     wxULongLongWx& operator++(int) { return ++(*this); }
 
         // post increment operator
     wxULongLongWx& operator++(int) { return ++(*this); }
 

-        // subraction (FIXME: should return wxLongLong)
-    wxULongLongWx operator-(const wxULongLongWx& ll) const;
+        // substraction
+    wxLongLongWx operator-(const wxULongLongWx& ll) const;

     wxULongLongWx& operator-=(const wxULongLongWx& ll);
 
         // pre decrement operator
     wxULongLongWx& operator-=(const wxULongLongWx& ll);
 
         // pre decrement operator


@@ -839,9 +870,13 @@ public:
     void *asArray() const;
 
 #if wxUSE_STD_IOSTREAM
     void *asArray() const;
 
 #if wxUSE_STD_IOSTREAM

-    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&);
+    friend WXDLLIMPEXP_BASE
+    wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&);

 #endif // wxUSE_STD_IOSTREAM
 
 #endif // wxUSE_STD_IOSTREAM
 

+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxULongLongWx&);
+

 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 


@@ -886,10 +921,10 @@ inline bool operator!=(unsigned long l, const wxULongLong& ull) { return ull !=
 
 inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return ull + l; }
 
 
 inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return ull + l; }
 

-// FIXME: this should return wxLongLong
-inline wxULongLong operator-(unsigned long l, const wxULongLong& ull)
+inline wxLongLong operator-(unsigned long l, const wxULongLong& ull)

 {
 {

-    return wxULongLong(l) - ull;
+    wxULongLong ret = wxULongLong(l) - ull;
+    return wxLongLong((long)ret.GetHi(),ret.GetLo());

 }
 
 #endif // _WX_LONGLONG_H
 }
 
 #endif // _WX_LONGLONG_H