X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6777e6575eaf7bf47b72c5910e5a4b31efd97a1..9df97be2c166a4d2c13e80f6a12411f03c2df023:/include/wx/pen.h?ds=sidebyside diff --git a/include/wx/pen.h b/include/wx/pen.h index 101b8be2de..f6e745bd81 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -148,6 +148,11 @@ extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; // compilers as it compares elements of different enums #if FUTURE_WXWIN_COMPATIBILITY_3_0 +// Unfortunately some compilers have ambiguity issues when enum comparisons are +// overloaded so we have to disable the overloads in this case, see +// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details. +#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM + inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t) { return static_cast(s) == static_cast(t); @@ -158,6 +163,8 @@ inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t) return !(s == t); } +#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM + #endif // FUTURE_WXWIN_COMPATIBILITY_3_0 #endif // _WX_PEN_H_BASE_