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

Side by Side Diff: src/sfnt/SkOTTable_gasp.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_OS_2_VA.h ('k') | src/sfnt/SkOTTable_head.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 2014 Google Inc. 2 * Copyright 2014 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_gasp_DEFINED 8 #ifndef SkOTTable_gasp_DEFINED
9 #define SkOTTable_gasp_DEFINED 9 #define SkOTTable_gasp_DEFINED
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 SK_OT_USHORT value; 60 SK_OT_USHORT value;
61 } raw; 61 } raw;
62 } flags; 62 } flags;
63 }; //gaspRange[numRanges] 63 }; //gaspRange[numRanges]
64 }; 64 };
65 65
66 #pragma pack(pop) 66 #pragma pack(pop)
67 67
68 68
69 #include <stddef.h> 69 #include <stddef.h>
70 SK_COMPILE_ASSERT(offsetof(SkOTTableGridAndScanProcedure, numRanges) == 2, SkOTT ableGridAndScanProcedure_numRanges_not_at_2); 70 static_assert(offsetof(SkOTTableGridAndScanProcedure, numRanges) == 2, "SkOTTabl eGridAndScanProcedure_numRanges_not_at_2");
71 SK_COMPILE_ASSERT(sizeof(SkOTTableGridAndScanProcedure) == 4, sizeof_SkOTTableGr idAndScanProcedure_not_4); 71 static_assert(sizeof(SkOTTableGridAndScanProcedure) == 4, "sizeof_SkOTTableGridA ndScanProcedure_not_4");
72 72
73 #endif 73 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_VA.h ('k') | src/sfnt/SkOTTable_head.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698