Implement wx_truncate_cast for VC++ 7.1 and later

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

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 1a006e757c5419a6aa5357650d2e218689265080..a0f98934e02230a96089569343a6ff868e1d37b8 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -13,10 +13,6 @@
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "longlong.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 


@@ -143,10 +139,10 @@ public:
     // accessors
         // get high part
     long GetHi() const
     // accessors
         // get high part
     long GetHi() const

-        { return (long)(m_ll >> 32); }
+        { return wx_truncate_cast(long, m_ll >> 32); }

         // get low part
     unsigned long GetLo() const
         // get low part
     unsigned long GetLo() const

-        { return (unsigned long)m_ll; }
+        { return wx_truncate_cast(unsigned long, m_ll); }

 
         // get absolute value
     wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); }
 
         // get absolute value
     wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); }


@@ -161,9 +157,12 @@ public:
         wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
                       _T("wxLongLong to long conversion loss of precision") );
 
         wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
                       _T("wxLongLong to long conversion loss of precision") );
 

-        return (long)m_ll;
+        return wx_truncate_cast(long, m_ll);

     }
 
     }
 

+        // convert to double
+    double ToDouble() const { return wx_truncate_cast(double, m_ll); }
+

     // don't provide implicit conversion to wxLongLong_t or we will have an
     // ambiguity for all arithmetic operations
     //operator wxLongLong_t() const { return m_ll; }
     // don't provide implicit conversion to wxLongLong_t or we will have an
     // ambiguity for all arithmetic operations
     //operator wxLongLong_t() const { return m_ll; }


@@ -215,13 +214,13 @@ public:
     // shifts
         // left shift
     wxLongLongNative operator<<(int shift) const
     // shifts
         // left shift
     wxLongLongNative operator<<(int shift) const

-        { return wxLongLongNative(m_ll << shift);; }
+        { return wxLongLongNative(m_ll << shift); }

     wxLongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxLongLongNative operator>>(int shift) const
     wxLongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxLongLongNative operator>>(int shift) const

-        { return wxLongLongNative(m_ll >> shift);; }
+        { return wxLongLongNative(m_ll >> shift); }

     wxLongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 
     wxLongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 


@@ -301,10 +300,12 @@ 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 wxString& operator<<(wxString&, const wxLongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxLongLongNative&);

 
 private:
     wxLongLong_t  m_ll;
 
 private:
     wxLongLong_t  m_ll;


@@ -318,13 +319,13 @@ public:
         // default ctor initializes to 0
     wxULongLongNative() : m_ll(0) { }
         // from long long
         // default ctor initializes to 0
     wxULongLongNative() : m_ll(0) { }
         // from long long

-    wxULongLongNative(unsigned wxLongLong_t ll) : m_ll(ll) { }
+    wxULongLongNative(wxULongLong_t ll) : m_ll(ll) { }

         // from 2 longs
     wxULongLongNative(unsigned long hi, unsigned long lo) : m_ll(0)
     {
         // assign first to avoid precision loss!
         // from 2 longs
     wxULongLongNative(unsigned long hi, unsigned long lo) : m_ll(0)
     {
         // assign first to avoid precision loss!

-        m_ll = ((unsigned wxLongLong_t) hi) << 32;
-        m_ll |= (unsigned wxLongLong_t) lo;
+        m_ll = ((wxULongLong_t) hi) << 32;
+        m_ll |= (wxULongLong_t) lo;

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


@@ -333,7 +334,7 @@ public:
 
     // assignment operators
         // from native 64 bit integer
 
     // assignment operators
         // from native 64 bit integer

-    wxULongLongNative& operator=(unsigned wxLongLong_t ll)
+    wxULongLongNative& operator=(wxULongLong_t ll)

         { m_ll = ll; return *this; }
 
     // assignment operators from wxULongLongNative is ok
         { m_ll = ll; return *this; }
 
     // assignment operators from wxULongLongNative is ok


@@ -341,13 +342,13 @@ public:
     // accessors
         // get high part
     unsigned long GetHi() const
     // accessors
         // get high part
     unsigned long GetHi() const

-        { return (unsigned long)(m_ll >> 32); }
+        { return wx_truncate_cast(unsigned long, m_ll >> 32); }

         // get low part
     unsigned long GetLo() const
         // get low part
     unsigned long GetLo() const

-        { return (unsigned long)m_ll; }
+        { return wx_truncate_cast(unsigned long, m_ll); }

 
         // convert to native ulong long
 
         // convert to native ulong long

-    unsigned wxLongLong_t GetValue() const { return m_ll; }
+    wxULongLong_t GetValue() const { return m_ll; }

 
         // convert to ulong with range checking in the debug mode (only!)
     unsigned long ToULong() const
 
         // convert to ulong with range checking in the debug mode (only!)
     unsigned long ToULong() const


@@ -355,7 +356,7 @@ public:
         wxASSERT_MSG( m_ll <= LONG_MAX,
                       _T("wxULongLong to long conversion loss of precision") );
 
         wxASSERT_MSG( m_ll <= LONG_MAX,
                       _T("wxULongLong to long conversion loss of precision") );
 

-        return (unsigned long)m_ll;
+        return wx_truncate_cast(unsigned long, m_ll);

     }
 
     // operations
     }
 
     // operations


@@ -365,9 +366,9 @@ public:
     wxULongLongNative& operator+=(const wxULongLongNative& ll)
         { m_ll += ll.m_ll; return *this; }
 
     wxULongLongNative& operator+=(const wxULongLongNative& ll)
         { m_ll += ll.m_ll; return *this; }
 

-    wxULongLongNative operator+(const unsigned wxLongLong_t ll) const
+    wxULongLongNative operator+(const wxULongLong_t ll) const

         { return wxULongLongNative(m_ll + ll); }
         { return wxULongLongNative(m_ll + ll); }

-    wxULongLongNative& operator+=(const unsigned wxLongLong_t ll)
+    wxULongLongNative& operator+=(const wxULongLong_t ll)

         { m_ll += ll; return *this; }
 
         // pre increment
         { m_ll += ll; return *this; }
 
         // pre increment


@@ -384,9 +385,9 @@ public:
     wxULongLongNative& operator-=(const wxULongLongNative& ll)
         { m_ll -= ll.m_ll; return *this; }
 
     wxULongLongNative& operator-=(const wxULongLongNative& ll)
         { m_ll -= ll.m_ll; return *this; }
 

-    wxULongLongNative operator-(const unsigned wxLongLong_t ll) const
+    wxULongLongNative operator-(const wxULongLong_t ll) const

         { return wxULongLongNative(m_ll - ll); }
         { return wxULongLongNative(m_ll - ll); }

-    wxULongLongNative& operator-=(const unsigned wxLongLong_t ll)
+    wxULongLongNative& operator-=(const wxULongLong_t ll)

         { m_ll -= ll; return *this; }
 
         // pre decrement
         { m_ll -= ll; return *this; }
 
         // pre decrement


@@ -400,13 +401,13 @@ public:
     // shifts
         // left shift
     wxULongLongNative operator<<(int shift) const
     // shifts
         // left shift
     wxULongLongNative operator<<(int shift) const

-        { return wxULongLongNative(m_ll << shift);; }
+        { return wxULongLongNative(m_ll << shift); }

     wxULongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxULongLongNative operator>>(int shift) const
     wxULongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxULongLongNative operator>>(int shift) const

-        { return wxULongLongNative(m_ll >> shift);; }
+        { return wxULongLongNative(m_ll >> shift); }

     wxULongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 
     wxULongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 


@@ -486,13 +487,15 @@ 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 wxString& operator<<(wxString&, const wxULongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxULongLongNative&);

 
 private:
 
 private:

-    unsigned wxLongLong_t  m_ll;
+    wxULongLong_t  m_ll;

 };
 
 #endif // wxUSE_LONGLONG_NATIVE
 };
 
 #endif // wxUSE_LONGLONG_NATIVE


@@ -586,6 +589,9 @@ public:
         return (long)m_lo;
     }
 
         return (long)m_lo;
     }
 

+        // convert to double
+    double ToDouble() const;
+

     // operations
         // addition
     wxLongLongWx operator+(const wxLongLongWx& ll) const;
     // operations
         // addition
     wxLongLongWx operator+(const wxLongLongWx& ll) const;


@@ -680,10 +686,12 @@ 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 wxString& operator<<(wxString&, const wxLongLongWx&);
+    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


@@ -792,7 +800,7 @@ public:
         // post increment operator
     wxULongLongWx& operator++(int) { return ++(*this); }
 
         // post increment operator
     wxULongLongWx& operator++(int) { return ++(*this); }
 

-        // substraction
+        // subtraction

     wxLongLongWx operator-(const wxULongLongWx& ll) const;
     wxULongLongWx& operator-=(const wxULongLongWx& ll);
 
     wxLongLongWx operator-(const wxULongLongWx& ll) const;
     wxULongLongWx& operator-=(const wxULongLongWx& ll);
 


@@ -864,10 +872,12 @@ 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 wxString& operator<<(wxString&, const wxULongLongWx&);
+    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


@@ -881,7 +891,7 @@ private:
         wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo );
     }
 
         wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo );
     }
 

-    unsigned wxLongLong_t m_ll;
+    wxULongLong_t m_ll;

 #endif // wxLONGLONG_TEST_MODE
 };
 
 #endif // wxLONGLONG_TEST_MODE
 };