Enable warnings-as-errors on Windows.
Review URL: https://codereview.appspot.com/7066054
git-svn-id: http://skia.googlecode.com/svn/trunk@7094 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/debugger/SkDebugCanvas.cpp b/debugger/SkDebugCanvas.cpp
index beb670b..5fcc076 100644
--- a/debugger/SkDebugCanvas.cpp
+++ b/debugger/SkDebugCanvas.cpp
@@ -7,12 +7,22 @@
*/
-#include <iostream>
#include "SkDebugCanvas.h"
#include "SkDrawCommand.h"
#include "SkDevice.h"
#include "SkImageWidget.h"
+#ifdef SK_BUILD_FOR_WIN
+ // iostream includes xlocale which generates warning 4530 because we're compiling without
+ // exceptions
+ #pragma warning(push)
+ #pragma warning(disable : 4530)
+#endif
+#include <iostream>
+#ifdef SK_BUILD_FOR_WIN
+ #pragma warning(pop)
+#endif
+
static SkBitmap make_noconfig_bm(int width, int height) {
SkBitmap bm;
bm.setConfig(SkBitmap::kNo_Config, width, height);