fix to previous patch: don't crash when saving in 16bpp

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

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 63db358fff4781960a0aa852816d1e80a2026923..62afbf79a4dc92e3a00d6218d025376015cb2762 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -751,7 +751,7 @@ wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
     m_hi = m_lo = 0;
 
 #ifdef wxLONGLONG_TEST_MODE
-    unsigned wxLongLong_t llOld = m_ll;
+    wxULongLong_t llOld = m_ll;
     m_ll = 0;
 #endif // wxLONGLONG_TEST_MODE
 
@@ -1150,11 +1150,13 @@ void *wxULongLongWx::asArray(void) const
 #if wxUSE_STD_IOSTREAM
 
 // input/output
+WXDLLIMPEXP_BASE
 wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll)
 {
     return o << ll.ToString();
 }
 
+WXDLLIMPEXP_BASE
 wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
 {
     return o << ll.ToString();
@@ -1162,12 +1164,12 @@ wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
 
 #endif // wxUSE_STD_IOSTREAM
 
-wxString& operator<< (wxString& s, const wxLongLong& ll)
+WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxLongLong& ll)
 {
     return s << ll.ToString();
 }
 
-wxString& operator<< (wxString& s, const wxULongLong& ll)
+WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
 {
     return s << ll.ToString();
 }