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

Side by Side Diff: src/sfnt/SkOTTable_name.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_maxp_TT.h ('k') | src/sfnt/SkOTTable_post.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_name_DEFINED 8 #ifndef SkOTTable_name_DEFINED
9 #define SkOTTable_name_DEFINED 9 #define SkOTTable_name_DEFINED
10 10
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 private: 569 private:
570 const SkOTTableName& fName; 570 const SkOTTableName& fName;
571 size_t fIndex; 571 size_t fIndex;
572 int fType; 572 int fType;
573 }; 573 };
574 }; 574 };
575 575
576 #pragma pack(pop) 576 #pragma pack(pop)
577 577
578 578
579 SK_COMPILE_ASSERT(sizeof(SkOTTableName) == 6, sizeof_SkOTTableName_not_6); 579 static_assert(sizeof(SkOTTableName) == 6, "sizeof_SkOTTableName_not_6");
580 SK_COMPILE_ASSERT(sizeof(SkOTTableName::Format1Ext) == 2, sizeof_SkOTTableNameF1 _not_2); 580 static_assert(sizeof(SkOTTableName::Format1Ext) == 2, "sizeof_SkOTTableNameF1_no t_2");
581 SK_COMPILE_ASSERT(sizeof(SkOTTableName::Format1Ext::LangTagRecord) == 4, sizeof_ SkOTTableNameLangTagRecord_not_4); 581 static_assert(sizeof(SkOTTableName::Format1Ext::LangTagRecord) == 4, "sizeof_SkO TTableNameLangTagRecord_not_4");
582 SK_COMPILE_ASSERT(sizeof(SkOTTableName::Record) == 12, sizeof_SkOTTableNameRecor d_not_12); 582 static_assert(sizeof(SkOTTableName::Record) == 12, "sizeof_SkOTTableNameRecord_n ot_12");
583 583
584 #endif 584 #endif
OLDNEW
« no previous file with comments | « src/sfnt/SkOTTable_maxp_TT.h ('k') | src/sfnt/SkOTTable_post.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698