From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 18 Jan 2005 13:15:20 +0000 (+0000)
Subject: more fixes to dllexport/import stuff for operator<<()s (still bug 1104372)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a353dc9852cc44fcffd339895ba3024d0eebbad7

more fixes to dllexport/import stuff for operator<<()s (still bug 1104372)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index d41c02ad1a..62d28c53c3 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -301,10 +301,12 @@ public:
 
 #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
 
-    friend wxString& operator<<(wxString&, const wxLongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    wxString& operator<<(wxString&, const wxLongLongNative&);
 
 private:
     wxLongLong_t  m_ll;
@@ -682,10 +684,12 @@ public:
     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
 
-    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
@@ -866,10 +870,12 @@ public:
     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
 
-    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
diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 2e589fa723..80fc379374 100644
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -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();