From 7f56c7c068496ac1ede9e849d9cadb458f2fc3b2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 6 Jan 2024 23:05:05 +0100 Subject: [PATCH] Hide operator<<() and operator>>() overlods for wxLongLong_t And wxULongLong_t. --- include/wx/longlong.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/include/wx/longlong.h b/include/wx/longlong.h index cad5c250ae..6762ad08fa 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -834,7 +834,14 @@ public: class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongWx&); friend WXDLLIMPEXP_BASE class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongWx&); -#endif + +#if wxUSE_LONGLONG_NATIVE + friend WXDLLIMPEXP_BASE + class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxLongLong_t value); + friend WXDLLIMPEXP_BASE + class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxLongLong_t &value); +#endif // wxUSE_LONGLONG_NATIVE +#endif // wxUSE_STREAMS private: // long is at least 32 bits, so represent our 64bit number as 2 longs @@ -1066,7 +1073,14 @@ public: class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongWx&); friend WXDLLIMPEXP_BASE class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongWx&); -#endif + +#if wxUSE_LONGLONG_NATIVE + friend WXDLLIMPEXP_BASE + class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxULongLong_t value); + friend WXDLLIMPEXP_BASE + class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxULongLong_t &value); +#endif // wxUSE_LONGLONG_NATIVE +#endif // wxUSE_STREAMS private: // long is at least 32 bits, so represent our 64bit number as 2 longs @@ -1086,16 +1100,6 @@ private: #endif // wxUSE_LONGLONG_WX -#if wxUSE_LONGLONG_NATIVE && wxUSE_STREAMS - -WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxULongLong_t value); -WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxLongLong_t value); - -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxULongLong_t &value); -WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxLongLong_t &value); - -#endif - // ---------------------------------------------------------------------------- // Specialize numeric_limits<> for our long long wrapper classes. // ----------------------------------------------------------------------------