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

Side by Side Diff: src/sfnt/SkSFNTHeader.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/SkPanose.h ('k') | src/sfnt/SkTTCFHeader.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 SkSFNTHeader_DEFINED 8 #ifndef SkSFNTHeader_DEFINED
9 #define SkSFNTHeader_DEFINED 9 #define SkSFNTHeader_DEFINED
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 SK_SFNT_ULONG tag; 57 SK_SFNT_ULONG tag;
58 SK_SFNT_ULONG checksum; 58 SK_SFNT_ULONG checksum;
59 SK_SFNT_ULONG offset; //From beginning of header. 59 SK_SFNT_ULONG offset; //From beginning of header.
60 SK_SFNT_ULONG logicalLength; 60 SK_SFNT_ULONG logicalLength;
61 }; //tableDirectoryEntries[numTables] 61 }; //tableDirectoryEntries[numTables]
62 }; 62 };
63 63
64 #pragma pack(pop) 64 #pragma pack(pop)
65 65
66 66
67 SK_COMPILE_ASSERT(sizeof(SkSFNTHeader) == 12, sizeof_SkSFNTHeader_not_12); 67 static_assert(sizeof(SkSFNTHeader) == 12, "sizeof_SkSFNTHeader_not_12");
68 SK_COMPILE_ASSERT(sizeof(SkSFNTHeader::TableDirectoryEntry) == 16, sizeof_SkSFNT Header_TableDirectoryEntry_not_16); 68 static_assert(sizeof(SkSFNTHeader::TableDirectoryEntry) == 16, "sizeof_SkSFNTHea der_TableDirectoryEntry_not_16");
69 69
70 #endif 70 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkPanose.h ('k') | src/sfnt/SkTTCFHeader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698