Better fix

[wxWidgets.git] / include / wx / cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 9ccc2a93c391d0e016492394f0ef0a0a27c06c12..e87892b5a2ef5a7be8bf0833e2a8a0807f6d13da 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -100,6 +100,8 @@
 
 #include "wx/string.h"
 
 
 #include "wx/string.h"
 

+#include <iostream>
+

 inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 {
 #if wxUSE_UNICODE
 inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 {
 #if wxUSE_UNICODE


@@ -109,6 +111,28 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s)
 #endif
 }
 
 #endif
 }
 

+// VC6 doesn't provide overloads for operator<<(__int64) in its stream classes
+// so do it ourselves
+#if defined(__VISUALC6__) && defined(wxLongLong_t)
+
+#include "wx/longlong.h"
+
+inline std::ostream& operator<<(std::ostream& ostr, wxLongLong_t ll)
+{
+    ostr << wxLongLong(ll).ToString();
+
+    return ostr;
+}
+
+inline std::ostream& operator<<(std::ostream& ostr, unsigned wxLongLong_t llu)
+{
+    ostr << wxULongLong(llu).ToString();
+
+    return ostr;
+}
+
+#endif // VC6 && wxLongLong_t
+

 #endif // !wxUSE_STD_IOSTREAM
 
 ///////////////////////////////////////////////////////////////////////////////
 #endif // !wxUSE_STD_IOSTREAM
 
 ///////////////////////////////////////////////////////////////////////////////