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

Side by Side Diff: src/sfnt/SkOTTable_hhea.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_head.h ('k') | src/sfnt/SkOTTable_maxp_CFF.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_hhea_DEFINED 8 #ifndef SkOTTable_hhea_DEFINED
9 #define SkOTTable_hhea_DEFINED 9 #define SkOTTable_hhea_DEFINED
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 SK_SEQ_END, 43 SK_SEQ_END,
44 (value)SK_SEQ_END) 44 (value)SK_SEQ_END)
45 } metricDataFormat; 45 } metricDataFormat;
46 SK_OT_USHORT numberOfHMetrics; 46 SK_OT_USHORT numberOfHMetrics;
47 }; 47 };
48 48
49 #pragma pack(pop) 49 #pragma pack(pop)
50 50
51 51
52 #include <stddef.h> 52 #include <stddef.h>
53 SK_COMPILE_ASSERT(offsetof(SkOTTableHorizontalHeader, numberOfHMetrics) == 34, S kOTTableHorizontalHeader_numberOfHMetrics_not_at_34); 53 static_assert(offsetof(SkOTTableHorizontalHeader, numberOfHMetrics) == 34, "SkOT TableHorizontalHeader_numberOfHMetrics_not_at_34");
54 SK_COMPILE_ASSERT(sizeof(SkOTTableHorizontalHeader) == 36, sizeof_SkOTTableHoriz ontalHeader_not_36); 54 static_assert(sizeof(SkOTTableHorizontalHeader) == 36, "sizeof_SkOTTableHorizont alHeader_not_36");
55 55
56 #endif 56 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_head.h ('k') | src/sfnt/SkOTTable_maxp_CFF.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698