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/SkTTCFHeader.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/SkSFNTHeader.h ('k') | src/svg/SkSVGDevice.cpp » ('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 2013 Google Inc. 2 * Copyright 2013 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 SkTTCFHeader_DEFINED 8 #ifndef SkTTCFHeader_DEFINED
9 #define SkTTCFHeader_DEFINED 9 #define SkTTCFHeader_DEFINED
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 static const SK_OT_ULONG TAG = SkOTTableTAG<dsigType_Format1>::value ; 44 static const SK_OT_ULONG TAG = SkOTTableTAG<dsigType_Format1>::value ;
45 }; 45 };
46 SK_OT_ULONG dsigLength; //Length of DSIG table (in bytes). 46 SK_OT_ULONG dsigLength; //Length of DSIG table (in bytes).
47 SK_OT_ULONG dsigOffset; //Offset of DSIG table from the beginning of fil e (in bytes). 47 SK_OT_ULONG dsigOffset; //Offset of DSIG table from the beginning of fil e (in bytes).
48 };// version2ext (if version == version_2) 48 };// version2ext (if version == version_2)
49 }; 49 };
50 50
51 #pragma pack(pop) 51 #pragma pack(pop)
52 52
53 53
54 SK_COMPILE_ASSERT(sizeof(SkTTCFHeader) == 12, sizeof_SkTTCFHeader_not_12); 54 static_assert(sizeof(SkTTCFHeader) == 12, "sizeof_SkTTCFHeader_not_12");
55 55
56 #endif 56 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkSFNTHeader.h ('k') | src/svg/SkSVGDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698