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

Side by Side Diff: src/sfnt/SkOTTable_head.h

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « src/sfnt/SkOTTable_gasp.h ('k') | src/sfnt/SkOTTable_hhea.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkOTTable_head_DEFINED 8 #ifndef SkOTTable_head_DEFINED
9 #define SkOTTable_head_DEFINED 9 #define SkOTTable_head_DEFINED
10 10
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 ((CurrentFormat, SkTEndian_SwapBE16(0))) 137 ((CurrentFormat, SkTEndian_SwapBE16(0)))
138 SK_SEQ_END, 138 SK_SEQ_END,
139 (value)SK_SEQ_END) 139 (value)SK_SEQ_END)
140 } glyphDataFormat; 140 } glyphDataFormat;
141 }; 141 };
142 142
143 #pragma pack(pop) 143 #pragma pack(pop)
144 144
145 145
146 #include <stddef.h> 146 #include <stddef.h>
147 SK_COMPILE_ASSERT(offsetof(SkOTTableHead, glyphDataFormat) == 52, SkOTTableHead_ glyphDataFormat_not_at_52); 147 static_assert(offsetof(SkOTTableHead, glyphDataFormat) == 52, "SkOTTableHead_gly phDataFormat_not_at_52");
148 SK_COMPILE_ASSERT(sizeof(SkOTTableHead) == 54, sizeof_SkOTTableHead_not_54); 148 static_assert(sizeof(SkOTTableHead) == 54, "sizeof_SkOTTableHead_not_54");
149 149
150 #endif 150 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_gasp.h ('k') | src/sfnt/SkOTTable_hhea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698