9ff9127930
This change fixes the build of wxWidgets itself by undefining _T() before including any standard headers and redefining it after including them. See #10660. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
72 lines
2.3 KiB
C
72 lines
2.3 KiB
C
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: include/wx/afterstd.h
|
|
// Purpose: #include after STL headers
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 07/07/03
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
/**
|
|
See the comments in beforestd.h.
|
|
*/
|
|
|
|
#if defined(__WXMSW__)
|
|
#include "wx/msw/winundef.h"
|
|
#endif
|
|
|
|
// undo what we did in wx/beforestd.h
|
|
#if defined(__VISUALC__) && __VISUALC__ <= 1201
|
|
// MSVC 5 does not have this
|
|
#if _MSC_VER > 1100
|
|
// don't restore this one for VC6, it gives it in each try/catch which is a
|
|
// bit annoying to say the least
|
|
#if _MSC_VER >= 0x1300
|
|
// unreachable code
|
|
#pragma warning(default:4702)
|
|
#endif // VC++ >= 7
|
|
|
|
#pragma warning(pop)
|
|
#else
|
|
// 'expression' : signed/unsigned mismatch
|
|
#pragma warning(default:4018)
|
|
|
|
// 'identifier' : unreferenced formal parameter
|
|
#pragma warning(default:4100)
|
|
|
|
// 'conversion' : conversion from 'type1' to 'type2',
|
|
// possible loss of data
|
|
#pragma warning(default:4244)
|
|
|
|
// C++ language change: to explicitly specialize class template
|
|
// 'identifier' use the following syntax
|
|
#pragma warning(default:4663)
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
Redefine _T if we undefined it in wx/beforestd.h (see comment there about
|
|
why do we do it) and if we need it (we always do when building wx itself
|
|
and might also need when compiling the user code but this must be indicated
|
|
by the special wxNEEDS__T macro)
|
|
*/
|
|
#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
|
|
#if defined(WXBUILDING) || defined(wxNEEDS_T)
|
|
/*
|
|
Undefine _T in case it was defined in the standard header.
|
|
*/
|
|
#undef _T
|
|
|
|
/*
|
|
And define it again in the same way as it's done in wx/wxchar.h.
|
|
*/
|
|
#if wxUSE_UNICODE
|
|
#define _T(x) wxCONCAT_HELPER(L, x)
|
|
#else /* !Unicode */
|
|
#define _T(x) x
|
|
#endif /* Unicode/!Unicode */
|
|
#endif /* we need _T() to be defined */
|
|
#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */
|