X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7aadf25fa7a912a11b317432900ec5abe748332..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/anystr.h?ds=sidebyside diff --git a/include/wx/anystr.h b/include/wx/anystr.h index 678741bdef..4251d37d1a 100644 --- a/include/wx/anystr.h +++ b/include/wx/anystr.h @@ -136,13 +136,5 @@ private: wxDECLARE_NO_ASSIGN_CLASS(wxAnyStrPtr); }; -// at least for VC6 and VC7 these operators are needed too, otherwise boolean -// expressions involving wxAnyStrPtr don't compile because of ambiguity between -// built-in overloads of these operators for (bool, bool/char*/wchar_t*) -inline bool operator||(const wxAnyStrPtr& p, bool v) { return (bool)p || v; } -inline bool operator||(bool v, const wxAnyStrPtr& p) { return v || (bool)p; } -inline bool operator&&(const wxAnyStrPtr& p, bool v) { return (bool)p && v; } -inline bool operator&&(bool v, const wxAnyStrPtr& p) { return v && (bool)p; } - #endif // _WX_ANYSTR_H_