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

Side by Side Diff: src/sfnt/SkOTTable_OS_2.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/SkOTTableTypes.h ('k') | src/sfnt/SkOTTable_OS_2_V0.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_OS_2_DEFINED 8 #ifndef SkOTTable_OS_2_DEFINED
9 #define SkOTTable_OS_2_DEFINED 9 #define SkOTTable_OS_2_DEFINED
10 10
(...skipping 24 matching lines...) Expand all
35 //makes fsType 0-3 exclusive 35 //makes fsType 0-3 exclusive
36 struct V3 : SkOTTableOS2_V3 { } v3; 36 struct V3 : SkOTTableOS2_V3 { } v3;
37 //defines fsSelection bits 7-9 37 //defines fsSelection bits 7-9
38 struct V4 : SkOTTableOS2_V4 { } v4; 38 struct V4 : SkOTTableOS2_V4 { } v4;
39 } version; 39 } version;
40 }; 40 };
41 41
42 #pragma pack(pop) 42 #pragma pack(pop)
43 43
44 44
45 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::VA) == 68, sizeof_SkOTTableOS2__ VA_not_68); 45 static_assert(sizeof(SkOTTableOS2::Version::VA) == 68, "sizeof_SkOTTableOS2__VA_ not_68");
46 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V0) == 78, sizeof_SkOTTableOS2__ V0_not_78); 46 static_assert(sizeof(SkOTTableOS2::Version::V0) == 78, "sizeof_SkOTTableOS2__V0_ not_78");
47 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V1) == 86, sizeof_SkOTTableOS2__ V1_not_86); 47 static_assert(sizeof(SkOTTableOS2::Version::V1) == 86, "sizeof_SkOTTableOS2__V1_ not_86");
48 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V2) == 96, sizeof_SkOTTableOS2__ V2_not_96); 48 static_assert(sizeof(SkOTTableOS2::Version::V2) == 96, "sizeof_SkOTTableOS2__V2_ not_96");
49 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V3) == 96, sizeof_SkOTTableOS2__ V3_not_96); 49 static_assert(sizeof(SkOTTableOS2::Version::V3) == 96, "sizeof_SkOTTableOS2__V3_ not_96");
50 SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V4) == 96, sizeof_SkOTTableOS2__ V4_not_96); 50 static_assert(sizeof(SkOTTableOS2::Version::V4) == 96, "sizeof_SkOTTableOS2__V4_ not_96");
51 51
52 #endif 52 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTableTypes.h ('k') | src/sfnt/SkOTTable_OS_2_V0.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698