Don't use dummy "inline" in wxDEPRECATED_CONSTRUCTOR definition.
Apparently we need this bogus "inline" for g++ < 3.4 but there is no reason to use it for the other compilers and this results in linking errors with e.g. MSVC, so remove it. Closes #13775. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -529,15 +529,14 @@ typedef short int WXTYPE;
|
||||
#define wxDEPRECATED(x) x
|
||||
#endif
|
||||
|
||||
/*
|
||||
explicitly specifying inline allows gcc < 3.4 to
|
||||
handle the deprecation attribute even in the constructor.
|
||||
doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
|
||||
*/
|
||||
#if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ )
|
||||
#define wxDEPRECATED_CONSTRUCTOR(x) x
|
||||
#else
|
||||
#if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4)
|
||||
/*
|
||||
We need to add dummy "inline" to allow gcc < 3.4 to handle the
|
||||
deprecation attribute on the constructors.
|
||||
*/
|
||||
#define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)
|
||||
#else
|
||||
#define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED(x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user