From: bungeman Date: Fri, 29 Apr 2016 15:27:14 +0000 (-0700) Subject: Remove skstd::is_function. X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~129^2~737 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4d46f03db6080da4ad3b228d37e0760c1029015;p=platform%2Fupstream%2FlibSkiaSharp.git Remove skstd::is_function. The VC++ STL with 2015u2 now provides a complete std::is_function. Also, Skia is no longer using skstd::is_function. Review-Url: https://codereview.chromium.org/1929343002 --- diff --git a/include/private/SkTLogic.h b/include/private/SkTLogic.h index c352b87..00a5aad 100644 --- a/include/private/SkTLogic.h +++ b/include/private/SkTLogic.h @@ -33,27 +33,6 @@ template using remove_pointer_t = typename std::remove_pointer:: template using remove_reference_t = typename std::remove_reference::type; template using remove_extent_t = typename std::remove_extent::type; -// template struct is_function< -// R [calling-convention] (Args...[, ...]) [const] [volatile] [&|&&]> : std::true_type {}; -// The cv and ref-qualified versions are strange types we're currently avoiding, so not supported. -// These aren't supported in msvc either until vs2015u2. -// On all platforms, variadic functions only exist in the c calling convention. -// mcvc 2013 introduced __vectorcall, but it wan't until 2015 that it was added to is_function. -template struct is_function : std::false_type {}; -#if !defined(WIN32) -template struct is_function : std::true_type {}; -#else -template struct is_function : std::true_type {}; -#if defined(_M_IX86) -template struct is_function : std::true_type {}; -template struct is_function : std::true_type {}; -#endif -#if defined(_MSC_VER) && (_M_IX86_FP >= 2 || defined(_M_AMD64) || defined(_M_X64)) -template struct is_function : std::true_type {}; -#endif -#endif -template struct is_function : std::true_type {}; - template using add_const_t = typename std::add_const::type; template using add_volatile_t = typename std::add_volatile::type; template using add_cv_t = typename std::add_cv::type;