diff options
| -rw-r--r-- | include/core/SkTemplates.h | 10 | ||||
| -rw-r--r-- | src/sfnt/SkOTTableTypes.h | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/include/core/SkTemplates.h b/include/core/SkTemplates.h index 4bcaf3f7b3..a6248f547f 100644 --- a/include/core/SkTemplates.h +++ b/include/core/SkTemplates.h @@ -11,7 +11,6 @@ #define SkTemplates_DEFINED #include "SkTypes.h" -#include <limits> #include <limits.h> #include <new> @@ -66,15 +65,6 @@ template <typename D, typename S> static D* SkTAddOffset(S* ptr, size_t byteOffs ); } -/** SkTSetBit<N, T>::value is a T with the Nth bit set. */ -template<unsigned N, typename T = uintmax_t> struct SkTSetBit { - static const T value = static_cast<T>(1) << N; - SK_COMPILE_ASSERT(sizeof(T)*CHAR_BIT > N, SkTSetBit_N_too_large); - SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, SkTSetBit_T_must_be_integer); - SK_COMPILE_ASSERT(!std::numeric_limits<T>::is_signed, SkTSetBit_T_must_be_unsigned); - SK_COMPILE_ASSERT(std::numeric_limits<T>::radix == 2, SkTSetBit_T_radix_must_be_2); -}; - /** \class SkAutoTCallVProc Call a function when this goes out of scope. The template uses two diff --git a/src/sfnt/SkOTTableTypes.h b/src/sfnt/SkOTTableTypes.h index c978cc0179..1f49518d59 100644 --- a/src/sfnt/SkOTTableTypes.h +++ b/src/sfnt/SkOTTableTypes.h @@ -48,13 +48,15 @@ public: /** 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); }; |