From 4fd9ecbe4d42eec6239095e6d40c6e0033571a10 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Tue, 14 Feb 2017 20:31:48 +0000
Subject: [PATCH] refs #876 Workaround GCC bug.
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274

---
 src/blackmisc/dbus.h | 4 ++--
 src/blackmisc/json.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blackmisc/dbus.h b/src/blackmisc/dbus.h
index 1e656de57..b63fd4923 100644
--- a/src/blackmisc/dbus.h
+++ b/src/blackmisc/dbus.h
@@ -84,7 +84,7 @@ namespace BlackMisc
             {
                 baseMarshall(static_cast<const TBaseOfT<Derived> *>(derived()), arg);
                 auto meta = introspect<Derived>().without(MetaFlags<DisabledForMarshalling>());
-                meta.forEachMember([ &, this ](auto member) { Private::marshallMember(arg, member.in(*derived())); });
+                meta.forEachMember([ &, this ](auto member) { Private::marshallMember(arg, member.in(*this->derived())); });
             }
 
             //! Unmarshall without begin/endStructure, for when composed within another object
@@ -92,7 +92,7 @@ namespace BlackMisc
             {
                 baseUnmarshall(static_cast<TBaseOfT<Derived> *>(derived()), arg);
                 auto meta = introspect<Derived>().without(MetaFlags<DisabledForMarshalling>());
-                meta.forEachMember([ &, this ](auto member) { Private::unmarshallMember(arg, member.in(*derived())); });
+                meta.forEachMember([ &, this ](auto member) { Private::unmarshallMember(arg, member.in(*this->derived())); });
             }
 
         private:
diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h
index aeb775dc3..7300a4df0 100644
--- a/src/blackmisc/json.h
+++ b/src/blackmisc/json.h
@@ -357,7 +357,7 @@ namespace BlackMisc
                 auto meta = introspect<Derived>().without(MetaFlags<DisabledForJson>());
                 meta.forEachMember([ &, this ](auto member)
                 {
-                    json << std::make_pair(CExplicitLatin1String(member.latin1Name()).toJsonKey(), std::cref(member.in(*derived())));
+                    json << std::make_pair(CExplicitLatin1String(member.latin1Name()).toJsonKey(), std::cref(member.in(*this->derived())));
                 });
                 return Json::appendJsonObject(json, baseToJson(static_cast<const TBaseOfT<Derived> *>(derived())));
             }
@@ -385,7 +385,7 @@ namespace BlackMisc
                     else
                     {
                         CJsonScope scope(member.latin1Name());
-                        value >> member.in(*derived());
+                        value >> member.in(*this->derived());
                     }
                 });
             }