flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 18:25:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #589 Removed GCC 4.7 workaround.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-02-01 21:02:40 +00:00
parent 4f2de590c6
commit 19dd72cf3e
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackmisc/propertyindexvariantmap.h
View File

@@ -25,16 +25,6 @@ namespace BlackMisc
class CPropertyIndexVariantMap;
// workaround GCC 4.7 bug
namespace Aviation { template <typename AVIO> class CModulator; }
namespace Private
{
template <typename T> struct is_default_constructible : std::is_default_constructible<T> {};
# if __GNUC__ == 4 && __GNUC_MINOR__ <= 7
template <typename T> struct is_default_constructible<Aviation::CModulator<T>> : std::false_type {};
# endif
}
namespace Mixin
{
@@ -76,14 +66,14 @@ namespace BlackMisc
const Derived *derived() const { return static_cast<const Derived *>(this); }
Derived *derived() { return static_cast<Derived *>(this); }
template <typename T, typename std::enable_if<Private::is_default_constructible<T>::value, int>::type = 0>
template <typename T, typename std::enable_if<std::is_default_constructible<T>::value, int>::type = 0>
CVariant myself() const { return CVariant::from(*derived()); }
template <typename T, typename std::enable_if<Private::is_default_constructible<T>::value, int>::type = 0>
template <typename T, typename std::enable_if<std::is_default_constructible<T>::value, int>::type = 0>
void myself(const CVariant &variant) { *derived() = variant.to<T>(); }
template <typename T, typename std::enable_if<! Private::is_default_constructible<T>::value, int>::type = 0>
template <typename T, typename std::enable_if<! std::is_default_constructible<T>::value, int>::type = 0>
CVariant myself() const { qFatal("isMyself should have been handled before reaching here"); return {}; }
template <typename T, typename std::enable_if<! Private::is_default_constructible<T>::value, int>::type = 0>
template <typename T, typename std::enable_if<! std::is_default_constructible<T>::value, int>::type = 0>
void myself(const CVariant &) { qFatal("isMyself should have been handled before reaching here"); }
template <typename T>