applied patch 432814: saving BMP in 1, 4 and 8 bpp

[wxWidgets.git] / src / common / longlong.cpp

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 5fd1016b5f3b0801fe2330aeebb14c156c1f30a3..319f92a40bcfb4f8d0a11b8955725178a89c153e 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -60,7 +60,7 @@ void *wxLongLongNative::asArray() const
 #if wxUSE_STD_IOSTREAM
 
 // input/output
 #if wxUSE_STD_IOSTREAM
 
 // input/output

-ostream& operator<< (ostream& o, const wxLongLongNative& ll)
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLongNative& ll)

 {
     char result[65];
 
 {
     char result[65];
 


@@ -70,7 +70,7 @@ ostream& operator<< (ostream& o, const wxLongLongNative& ll)
 
     for (int i = 0; i < 64; i++)
     {
 
     for (int i = 0; i < 64; i++)
     {

-        result[63 - i] = '0' + (char) ((ll.m_ll >> i) & 1);
+        result[63 - i] = '0' + (char) ((ll.GetValue() >> i) & 1);

     }
 
     return o << result;
     }
 
     return o << result;


@@ -591,7 +591,9 @@ wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
 
     Divide(ll, quotient, remainder);
 
 
     Divide(ll, quotient, remainder);
 

-    return *this = quotient;
+    *this = quotient;
+    
+    return *this;

 }
 
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
 }
 
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const


@@ -627,7 +629,7 @@ void *wxLongLongWx::asArray(void) const
 #if wxUSE_STD_IOSTREAM
 
 // input/output
 #if wxUSE_STD_IOSTREAM
 
 // input/output

-ostream& operator<< (ostream& o, const wxLongLongWx& ll)
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLongWx& ll)

 {
     char result[65];
 
 {
     char result[65];