chrome/browser/profile_resetter/resettable_settings_snapshot.cc - Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profile_resetter/resettable_settings_snapshot.cc

Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments Created 6 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter_unittest.cc ('k') | chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/resettable_settings_snapshot.cc

diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

index fb58ee387c38371b040a0c301e3596e60d43dfe2..336a8a7e2cdde9c4426986b0abd7d471af9ab4e7 100644

--- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

+++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc

@@ -126,8 +126,8 @@ int ResettableSettingsSnapshot::FindDifferentFields(

if (shortcuts_ != snapshot.shortcuts_)

bit_mask |= SHORTCUTS;

- COMPILE_ASSERT(ResettableSettingsSnapshot::ALL_FIELDS == 31,

- add_new_field_here);

+ static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,

+ "new field needs to be added here");

return bit_mask;

}

@@ -211,8 +211,8 @@ std::string SerializeSettingsReport(const ResettableSettingsSnapshot& snapshot,

dict.Set(kShortcuts, list);

}

- COMPILE_ASSERT(ResettableSettingsSnapshot::ALL_FIELDS == 31,

- serialize_new_field_here);

+ static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,

+ "new field needs to be serialized here");

std::string json;

base::JSONWriter::Write(&dict, &json);