| Index: ui/base/resource/data_pack.cc
|
| diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc
|
| index 70841b6ba8f32a883f718d5b387800236cab1e39..f9fe9b8469eeb35d3369a4c32cb09ace5ba48b0f 100644
|
| --- a/ui/base/resource/data_pack.cc
|
| +++ b/ui/base/resource/data_pack.cc
|
| @@ -42,7 +42,7 @@ struct DataPackEntry {
|
| };
|
| #pragma pack(pop)
|
|
|
| -COMPILE_ASSERT(sizeof(DataPackEntry) == 6, size_of_entry_must_be_six);
|
| +static_assert(sizeof(DataPackEntry) == 6, "size of entry must be six");
|
|
|
| // We're crashing when trying to load a pak file on Windows. Add some error
|
| // codes for logging.
|
| @@ -181,8 +181,8 @@ bool DataPack::GetStringPiece(uint16 resource_id,
|
| // bothering to do right now.
|
| #if defined(__BYTE_ORDER)
|
| // Linux check
|
| - COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
|
| - datapack_assumes_little_endian);
|
| + static_assert(__BYTE_ORDER == __LITTLE_ENDIAN,
|
| + "datapack assumes little endian");
|
| #elif defined(__BIG_ENDIAN__)
|
| // Mac check
|
| #error DataPack assumes little endian
|
|
|