Update ICU to 54.1 step 1

source/test/letest/SimpleFontInstance.cpp

Index: source/test/letest/SimpleFontInstance.cpp
diff --git a/source/test/letest/SimpleFontInstance.cpp b/source/test/letest/SimpleFontInstance.cpp
index 8051bf5c6997c9916d1631f364f54a0ea70354a9..30849f734842648ce09beb88b9868b68380664f0 100644
--- a/source/test/letest/SimpleFontInstance.cpp
+++ b/source/test/letest/SimpleFontInstance.cpp
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
  *
- *   Copyright (C) 1999-2013, International Business Machines
+ *   Copyright (C) 1999-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
@@ -17,7 +17,10 @@
 #include "layout/LETypes.h"
 #include "layout/LEFontInstance.h"
 
+#ifndef USING_ICULEHB
 #include "CanonShaping.h"
+#endif
+
 #include "SimpleFontInstance.h"
 
 SimpleFontInstance::SimpleFontInstance(float pointSize, LEErrorCode &status)
@@ -40,6 +43,7 @@ SimpleFontInstance::~SimpleFontInstance()
 
 const void *SimpleFontInstance::getFontTable(LETag tableTag) const
 {
+#ifndef USING_ICULEHB
     if (tableTag == LE_GSUB_TABLE_TAG) {
         return CanonShaping::glyphSubstitutionTable;
     }
@@ -47,7 +51,7 @@ const void *SimpleFontInstance::getFontTable(LETag tableTag) const
     if (tableTag == LE_GDEF_TABLE_TAG) {
         return CanonShaping::glyphDefinitionTable;
     }
-
+#endif
     return NULL;
 }
 
@@ -60,6 +64,7 @@ void SimpleFontInstance::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) cons
         advance.fX = 0;
     }
 #else
+    (void)glyph;  // Suppress unused parameter compiler warning.
     advance.fX = xUnitsToPoints(2048);
 #endif