AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-01-18 13:15:20 +00:00
parent 58187c862c
commit a353dc9852
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/longlong.h
View File

@ -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

2
src/common/longlong.cpp
View File

@ -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();