From aa709c269ab76c891d10788047d8e6866c5898a2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 Jan 2008 23:32:12 +0000 Subject: [PATCH] compilation fix after r51188: only define operator<<() overloads for wxLongLong_t for VC6, next VC versions (and presumably all other compilers as we hadn't had problems with them before) define them in their standard library already git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cppunit.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 4160617d6d..e87892b5a2 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -111,7 +111,9 @@ inline std::ostream& operator<<(std::ostream& o, const wxString& s) #endif } -#ifdef wxLongLong_t +// 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" @@ -129,7 +131,7 @@ inline std::ostream& operator<<(std::ostream& ostr, unsigned wxLongLong_t llu) return ostr; } -#endif // wxLongLong_t +#endif // VC6 && wxLongLong_t #endif // !wxUSE_STD_IOSTREAM -- 2.45.2