From d75b73a309d5b6064a6e13d9a7eb998e0ec53822 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Sat, 30 Mar 2019 00:06:54 -0700
Subject: [PATCH] fix rebase errors

---
 .circleci/config.yml  | 11 -----------
 src/hb-common.h       |  2 +-
 src/hb-directwrite.cc | 15 ++++++++++++++-
 src/hb-directwrite.h  |  3 +++
 src/hb-null.hh        |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5cb0f3db8..a747ec5c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,16 +32,6 @@ jobs:
       - run: make -j4
       - run: make check || .ci/fail.sh
 
-  macos-notest-ios:
-    macos:
-      xcode: "10.2.0"
-    steps:
-      - checkout
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo icu4c graphite2
-      - run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext --with-graphite2
-      - run: make -j4
-      - run: make check || .ci/fail.sh
-
   distcheck:
     docker:
       - image: ubuntu:17.10
@@ -312,7 +302,6 @@ workflows:
       - macos-10.12.6-aat-fonts
       - macos-10.13.6-aat-fonts
       - macos-10.14.3-aat-fonts
-      - macos-notest-ios
 
       # both autotools and cmake
       - distcheck
diff --git a/src/hb-common.h b/src/hb-common.h
index fbabd71c8..371b2bfc9 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -358,7 +358,7 @@ typedef enum
   /*11.0*/HB_SCRIPT_SOGDIAN			= HB_TAG ('S','o','g','d'),
 
   /*
-   * Since REPLACEME
+   * Since 2.4.0
    */
   /*12.0*/HB_SCRIPT_ELYMAIC			= HB_TAG ('E','l','y','m'),
   /*12.0*/HB_SCRIPT_NANDINAGARI			= HB_TAG ('N','a','n','d'),
diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc
index d5d0b376f..d8076c922 100644
--- a/src/hb-directwrite.cc
+++ b/src/hb-directwrite.cc
@@ -931,7 +931,8 @@ _hb_directwrite_font_release (void *data)
 /**
  * hb_directwrite_face_create:
  * @font_face:
- * Since: REPLACEME
+ *
+ * Since: 2.4.0
  **/
 hb_face_t *
 hb_directwrite_face_create (IDWriteFontFace *font_face)
@@ -941,3 +942,15 @@ hb_directwrite_face_create (IDWriteFontFace *font_face)
   return hb_face_create_for_tables (reference_table, font_face,
 				    _hb_directwrite_font_release);
 }
+
+/**
+* hb_directwrite_face_get_font_face:
+* @face:
+*
+* Since: REPLACEME
+**/
+IDWriteFontFace *
+hb_directwrite_face_get_font_face (hb_face_t *face)
+{
+  return face->data.directwrite->fontFace;
+}
diff --git a/src/hb-directwrite.h b/src/hb-directwrite.h
index 09776fd09..de813d069 100644
--- a/src/hb-directwrite.h
+++ b/src/hb-directwrite.h
@@ -37,6 +37,9 @@ hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer,
 HB_EXTERN hb_face_t *
 hb_directwrite_face_create (IDWriteFontFace *font_face);
 
+HB_EXTERN IDWriteFontFace *
+hb_directwrite_face_get_font_face (hb_face_t *face);
+
 HB_END_DECLS
 
 #endif /* HB_DIRECTWRITE_H */
diff --git a/src/hb-null.hh b/src/hb-null.hh
index 4056366a4..9d23d50c3 100644
--- a/src/hb-null.hh
+++ b/src/hb-null.hh
@@ -95,7 +95,7 @@ struct Null {
 template <typename QType>
 struct NullHelper
 {
-  typedef typename hb_remove_const (typename hb_remove_reference (QType)) Type;
+  typedef hb_remove_const (hb_remove_reference (QType)) Type;
   static const Type & get_null () { return Null<Type>::get_null (); }
 };
 #define Null(Type) NullHelper<Type>::get_null ()