Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: include/private/SkTLogic.h

Issue 1589933002: Fixed compilation on mingw. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/ports/SkOSLibrary_win.cpp » ('j') | src/ports/SkOSLibrary_win.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/private/SkTLogic.h
diff --git a/include/private/SkTLogic.h b/include/private/SkTLogic.h
index 49fd6c1c7bd08394e2b46bf6e4c28e339143d542..bf33a0305f4836b611f40201a0e265c24bf91462 100644
--- a/include/private/SkTLogic.h
+++ b/include/private/SkTLogic.h
@@ -49,14 +49,16 @@ template <typename R, typename... Args> struct is_function<R(Args...)> : std::tr
template <typename R, typename... Args> struct is_function<R __cdecl (Args...)> : std::true_type {};
template <typename R, typename... Args> struct is_function<R __stdcall (Args...)> : std::true_type {};
template <typename R, typename... Args> struct is_function<R __fastcall (Args...)> : std::true_type {};
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+#if defined(_MSC_VER) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
template <typename R, typename... Args> struct is_function<R __vectorcall (Args...)> : std::true_type {};
#endif
#else
template <typename R, typename... Args> struct is_function<R __cdecl (Args...)> : std::true_type {};
+#if defined(_MSC_VER)
template <typename R, typename... Args> struct is_function<R __vectorcall (Args...)> : std::true_type {};
#endif
#endif
+#endif
bungeman-skia 2016/01/14 18:04:58 I would really like to avoid another nesting ifdef
template <typename R, typename... Args> struct is_function<R(Args..., ...)> : std::true_type {};
template <typename T> using add_const_t = typename std::add_const<T>::type;
« no previous file with comments | « no previous file | src/ports/SkOSLibrary_win.cpp » ('j') | src/ports/SkOSLibrary_win.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698