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

Side by Side Diff: src/sfnt/SkOTTable_post.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_name.h ('k') | src/sfnt/SkPanose.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_post_DEFINED 8 #ifndef SkOTTable_post_DEFINED
9 #define SkOTTable_post_DEFINED 9 #define SkOTTable_post_DEFINED
10 10
(...skipping 28 matching lines...) Expand all
39 SK_OT_ULONG minMemType42; 39 SK_OT_ULONG minMemType42;
40 SK_OT_ULONG maxMemType42; 40 SK_OT_ULONG maxMemType42;
41 SK_OT_ULONG minMemType1; 41 SK_OT_ULONG minMemType1;
42 SK_OT_ULONG maxMemType1; 42 SK_OT_ULONG maxMemType1;
43 }; 43 };
44 44
45 #pragma pack(pop) 45 #pragma pack(pop)
46 46
47 47
48 #include <stddef.h> 48 #include <stddef.h>
49 SK_COMPILE_ASSERT(offsetof(SkOTTablePostScript, maxMemType1) == 28, SkOTTablePos tScript_maxMemType1_not_at_28); 49 static_assert(offsetof(SkOTTablePostScript, maxMemType1) == 28, "SkOTTablePostSc ript_maxMemType1_not_at_28");
50 SK_COMPILE_ASSERT(sizeof(SkOTTablePostScript) == 32, sizeof_SkOTTablePostScript_ not_32); 50 static_assert(sizeof(SkOTTablePostScript) == 32, "sizeof_SkOTTablePostScript_not _32");
51 51
52 #endif 52 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_name.h ('k') | src/sfnt/SkPanose.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698