diff options
| -rw-r--r-- | include/private/SkTLogic.h | 1 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_android_parser.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/private/SkTLogic.h b/include/private/SkTLogic.h index 8d07ba1d38..0ca0d0f11b 100644 --- a/include/private/SkTLogic.h +++ b/include/private/SkTLogic.h @@ -31,6 +31,7 @@ template <bool B, typename T = void> using enable_if_t = typename std::enable_if template <typename T> using remove_const_t = typename std::remove_const<T>::type; template <typename T> using remove_volatile_t = typename std::remove_volatile<T>::type; template <typename T> using remove_cv_t = typename std::remove_cv<T>::type; +template <typename T> using remove_pointer_t = typename std::remove_pointer<T>::type; template <typename T> using remove_reference_t = typename std::remove_reference<T>::type; template <typename T> using remove_extent_t = typename std::remove_extent<T>::type; diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp index ba2296bffa..29ea52523d 100644 --- a/src/ports/SkFontMgr_android_parser.cpp +++ b/src/ports/SkFontMgr_android_parser.cpp @@ -12,6 +12,7 @@ #include "SkTDArray.h" #include "SkTSearch.h" #include "SkTemplates.h" +#include "SkTLogic.h" #include <dirent.h> #include <expat.h> @@ -579,9 +580,6 @@ static const XML_Memory_Handling_Suite sk_XML_alloc = { sk_free }; -template<typename T> struct remove_ptr {typedef T type;}; -template<typename T> struct remove_ptr<T*> {typedef T type;}; - /** * This function parses the given filename and stores the results in the given * families array. Returns the version of the file, negative if the file does not exist. @@ -598,7 +596,7 @@ static int parse_config_file(const char* filename, SkTDArray<FontFamily*>& famil return -1; } - SkAutoTCallVProc<remove_ptr<XML_Parser>::type, XML_ParserFree> parser( + SkAutoTCallVProc<skstd::remove_pointer_t<XML_Parser>, XML_ParserFree> parser( XML_ParserCreate_MM(nullptr, &sk_XML_alloc, nullptr)); if (!parser) { SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "could not create XML parser\n"); |