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

Unified Diff: sky/engine/platform/fonts/GlyphPage.h

Issue 719063002: Revert "Remove support for MSVC" (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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: sky/engine/platform/fonts/GlyphPage.h
diff --git a/sky/engine/platform/fonts/GlyphPage.h b/sky/engine/platform/fonts/GlyphPage.h
index e835629e961f1a18fb6214009d0a9c9f1bc64bb9..ae7ae6d1d2668448e2490e0a053c8167c14d9d80 100644
--- a/sky/engine/platform/fonts/GlyphPage.h
+++ b/sky/engine/platform/fonts/GlyphPage.h
@@ -56,6 +56,11 @@ struct GlyphData {
const SimpleFontData* fontData;
};
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning
+#endif
+
// A GlyphPage contains a fixed-size set of GlyphData mappings for a contiguous
// range of characters in the Unicode code space. GlyphPages are indexed
// starting from 0 and incrementing for each 256 glyphs.
@@ -213,6 +218,10 @@ private:
const SimpleFontData* m_perGlyphFontData[0];
};
+#if COMPILER(MSVC)
+#pragma warning(pop)
+#endif
+
} // namespace blink
#endif // GlyphPage_h

Powered by Google App Engine
This is Rietveld 408576698