Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly can't be used to build the current wxWidgets sources anyhow, so remove all support for it, including a lot of extremely ugly workarounds for its bugs with template functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,30 +26,6 @@
|
||||
// helpers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef __WATCOMC__
|
||||
|
||||
// WATCOM-FIXME: C++ of Open Watcom 1.3 doesn't like OnScopeExit() created
|
||||
// through template so it must be workarounded with dedicated inlined macro.
|
||||
// For compatibility with Watcom compilers wxPrivate::OnScopeExit must be
|
||||
// replaced with wxPrivateOnScopeExit but in user code (for everyone who
|
||||
// doesn't care about OW compatibility) wxPrivate::OnScopeExit still works.
|
||||
|
||||
#define wxPrivateOnScopeExit(guard) \
|
||||
{ \
|
||||
if ( !(guard).WasDismissed() ) \
|
||||
{ \
|
||||
wxTRY \
|
||||
{ \
|
||||
(guard).Execute(); \
|
||||
} \
|
||||
wxCATCH_ALL(;) \
|
||||
} \
|
||||
}
|
||||
|
||||
#define wxPrivateUse(n) wxUnusedVar(n)
|
||||
|
||||
#else
|
||||
|
||||
namespace wxPrivate
|
||||
{
|
||||
// in the original implementation this was a member template function of
|
||||
@@ -79,8 +55,6 @@ namespace wxPrivate
|
||||
#define wxPrivateOnScopeExit(n) wxPrivate::OnScopeExit(n)
|
||||
#define wxPrivateUse(n) wxPrivate::Use(n)
|
||||
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// wxScopeGuard for functions and functors
|
||||
// ============================================================================
|
||||
|
Reference in New Issue
Block a user