From e1b2edb04af7bd2b4eecb59392f75abcc72cd8a6 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 15 May 2019 01:12:04 -0700
Subject: [PATCH] Completely revert the thing back

---
 src/hb-open-type.hh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index 1471f5120..57b22a8e3 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -279,15 +279,6 @@ struct OffsetTo : Offset<OffsetType, has_null>
     return StructAtOffset<Type> (base, *this);
   }
 
-  template <typename Base>
-  friend const Type& operator + (const Base &base, const OffsetTo &offset) { return offset (base); }
-  template <typename Base>
-  friend const Type& operator + (const OffsetTo &offset, const Base &base) { return offset (base); }
-  template <typename Base>
-  friend Type& operator + (Base &base, OffsetTo &offset) { return offset (base); }
-  template <typename Base>
-  friend Type& operator + (OffsetTo &offset, Base &base) { return offset (base); }
-
   Type& serialize (hb_serialize_context_t *c, const void *base)
   {
     return * (Type *) Offset<OffsetType>::serialize (c, base);
@@ -366,6 +357,11 @@ using NNOffsetTo = OffsetTo<Type, OffsetType, false>;
 template <typename Type>
 using LNNOffsetTo = LOffsetTo<Type, false>;
 
+template <typename Base, typename OffsetType, bool has_null, typename Type>
+static inline const Type& operator + (const Base &base, const OffsetTo<Type, OffsetType, has_null> &offset) { return offset (base); }
+template <typename Base, typename OffsetType, bool has_null, typename Type>
+static inline Type& operator + (Base &base, OffsetTo<Type, OffsetType, has_null> &offset) { return offset (base); }
+
 
 /*
  * Array Types