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

Unified Diff: src/animator/SkDrawColor.cpp

Issue 1777213003: Remove version checks for _MSC_VER < 1800 (msvs2013). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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
Index: src/animator/SkDrawColor.cpp
diff --git a/src/animator/SkDrawColor.cpp b/src/animator/SkDrawColor.cpp
index c2d0dae8fe6f6a309eec7e7452ece7cd8704ad91..529d9a5954c4a9095b27eda9c0a92eeb95f65d53 100644
--- a/src/animator/SkDrawColor.cpp
+++ b/src/animator/SkDrawColor.cpp
@@ -52,7 +52,7 @@ static SkScalar RGB_to_HSV(SkColor color, HSV_Choice choice) {
return hue;
}
-#if defined _WIN32 && _MSC_VER >= 1300 // disable 'red', etc. may be used without having been initialized
+#if defined _WIN32 // disable 'red', etc. may be used without having been initialized
#pragma warning ( push )
#pragma warning ( disable : 4701 )
#endif
@@ -89,7 +89,7 @@ static SkColor HSV_to_RGB(SkColor color, HSV_Choice choice, SkScalar hsv) {
SkScalarRoundToInt(green), SkScalarRoundToInt(blue));
}
-#if defined _WIN32 && _MSC_VER >= 1300
+#if defined _WIN32
#pragma warning ( pop )
#endif

Powered by Google App Engine
This is Rietveld 408576698