Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do the VC6 hacks only when compiling with VC6

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-01-30 08:49:42 +00:00
parent e6649f2d55
commit 04e5392a8d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/meta/if.h
View File

@@ -53,7 +53,11 @@ struct wxIfImpl<true>
{ {
template<typename TTrue, typename TFalse> struct Result template<typename TTrue, typename TFalse> struct Result
{ {
#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
struct value : TTrue { }; struct value : TTrue { };
#else
typedef TTrue value;
#endif
}; };
}; };
@@ -63,7 +67,11 @@ struct wxIfImpl<false>
{ {
template<typename TTrue, typename TFalse> struct Result template<typename TTrue, typename TFalse> struct Result
{ {
#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
struct value : TFalse { }; struct value : TFalse { };
#else
typedef TFalse value;
#endif
}; };
}; };
@@ -77,9 +85,15 @@ struct wxIfImpl<false>
template<bool Cond, typename TTrue, typename TFalse> template<bool Cond, typename TTrue, typename TFalse>
struct wxIf struct wxIf
{ {
#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
// notice that value can't be a typedef, VC6 refuses to use it as a base // notice that value can't be a typedef, VC6 refuses to use it as a base
// class in this case // class in this case
struct value : wxPrivate::wxIfImpl<Cond>::Result<TTrue, TFalse>::value { }; struct value : wxPrivate::wxIfImpl<Cond>::Result<TTrue, TFalse>::value { };
#else // !VC6++
typedef typename wxPrivate::wxIfImpl<Cond>
::template Result<TTrue, TFalse>::value
value;
#endif
}; };
#endif // _WX_META_IF_H_ #endif // _WX_META_IF_H_