Fold SkTSetBit into SkOTSet*Bit.

src/sfnt/SkOTTableTypes.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkOTTableTypes_DEFINED
 #define SkOTTableTypes_DEFINED
 
@@ skipping 30 matching lines @@
      * SkOTTableTAG<T>::value is the big endian value of an OpenType table tag.
      * It may be directly compared with raw big endian table data.
      */
     static const SK_OT_ULONG value = SkTEndian_SwapBE32(
         SkSetFourByteTag(T::TAG0, T::TAG1, T::TAG2, T::TAG3)
     );
 };
 
 /** SkOTSetUSHORTBit<N>::value is an SK_OT_USHORT with the Nth BE bit set. */
 template <unsigned N> struct SkOTSetUSHORTBit {
-    static const uint16_t bit = SkTSetBit<N, uint16_t>::value;
+    SK_COMPILE_ASSERT(N < 16, NTooBig);
+    static const uint16_t bit = 1u << N;
     static const SK_OT_USHORT value = SkTEndian_SwapBE16(bit);
 };
 
-/** SkOTSetUSHORTBit<N>::value is an SK_OT_ULONG with the Nth BE bit set. */
+/** SkOTSetULONGBit<N>::value is an SK_OT_ULONG with the Nth BE bit set. */
 template <unsigned N> struct SkOTSetULONGBit {
-    static const uint32_t bit = SkTSetBit<N, uint32_t>::value;
+    SK_COMPILE_ASSERT(N < 32, NTooBig);
+    static const uint32_t bit = 1u << N;
     static const SK_OT_ULONG value = SkTEndian_SwapBE32(bit);
 };
 
 #endif