From 19dd72cf3ed11b9f829e88560d8c8ed4bb6c1d92 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Mon, 1 Feb 2016 21:02:40 +0000
Subject: [PATCH] refs #589 Removed GCC 4.7 workaround.

---
 src/blackmisc/propertyindexvariantmap.h | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index 66e14b82d..4b6ed5f16 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -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>