Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxLongLong to wxString operators.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-27 18:57:21 +00:00
parent 9d8aca4832
commit 51496782d1
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/longlong.h
View File

@@ -304,6 +304,8 @@ public:
friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&); friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);
#endif #endif
friend wxString& operator<<(wxString&, const wxLongLongNative&);
private: private:
wxLongLong_t m_ll; wxLongLong_t m_ll;
}; };
@@ -487,6 +489,8 @@ public:
friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&); friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&);
#endif #endif
friend wxString& operator<<(wxString&, const wxULongLongNative&);
private: private:
unsigned wxLongLong_t m_ll; unsigned wxLongLong_t m_ll;
}; };
@@ -679,6 +683,8 @@ public:
friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&); friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);
#endif // wxUSE_STD_IOSTREAM #endif // wxUSE_STD_IOSTREAM
friend wxString& operator<<(wxString&, const wxLongLongWx&);
private: private:
// long is at least 32 bits, so represent our 64bit number as 2 longs // long is at least 32 bits, so represent our 64bit number as 2 longs
@@ -861,6 +867,8 @@ public:
friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&); friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&);
#endif // wxUSE_STD_IOSTREAM #endif // wxUSE_STD_IOSTREAM
friend wxString& operator<<(wxString&, const wxULongLongWx&);
private: private:
// long is at least 32 bits, so represent our 64bit number as 2 longs // long is at least 32 bits, so represent our 64bit number as 2 longs

10
src/common/longlong.cpp
View File

@@ -1162,4 +1162,14 @@ wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
#endif // wxUSE_STD_IOSTREAM #endif // wxUSE_STD_IOSTREAM
wxString& operator<< (wxString& s, const wxLongLong& ll)
{
return s << ll.ToString();
}
wxString& operator<< (wxString& s, const wxULongLong& ll)
{
return s << ll.ToString();
}
#endif // wxUSE_LONGLONG #endif // wxUSE_LONGLONG

4
tests/longlong/longlongtest.cpp
View File

@@ -281,6 +281,10 @@ void LongLongTestCase::ToString()
s2 = a.ToString(); s2 = a.ToString();
CPPUNIT_ASSERT( s1 == s2 ); CPPUNIT_ASSERT( s1 == s2 );
s2 = wxEmptyString;
s2 << a;
CPPUNIT_ASSERT( s1 == s2 );
#if wxUSE_LONGLONG_WX #if wxUSE_LONGLONG_WX
wxLongLongWx a1 = testLongs[n]; wxLongLongWx a1 = testLongs[n];
s2 = a1.ToString(); s2 = a1.ToString();