diff options
| author | avi <avi@chromium.org> | 2015-11-24 06:26:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 14:27:16 +0000 |
| commit | 4ec0dffe9e013e64058ff506a76bc822957227aa (patch) | |
| tree | 505796dd4533ddb36753b6391bb20e59fd1dbd9b /base/metrics | |
| parent | bfd6ebdc7511f63ebae483cc82ce5ed989f470ca (diff) | |
| download | chromium_src-4ec0dffe9e013e64058ff506a76bc822957227aa.zip chromium_src-4ec0dffe9e013e64058ff506a76bc822957227aa.tar.gz chromium_src-4ec0dffe9e013e64058ff506a76bc822957227aa.tar.bz2 | |
Switch to static_assert in base/.
BUG=442514
Review URL: https://codereview.chromium.org/1467003002
Cr-Commit-Position: refs/heads/master@{#361337}
Diffstat (limited to 'base/metrics')
| -rw-r--r-- | base/metrics/field_trial.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc index 2ad7517..e9e3be2 100644 --- a/base/metrics/field_trial.cc +++ b/base/metrics/field_trial.cc @@ -325,12 +325,11 @@ FieldTrial* FieldTrialList::FactoryGetFieldTrialWithRandomizationSeed( // group number, so that it does not conflict with the |AppendGroup()| // result for the chosen group. const int kNonConflictingGroupNumber = -2; - COMPILE_ASSERT( + static_assert( kNonConflictingGroupNumber != FieldTrial::kDefaultGroupNumber, - conflicting_default_group_number); - COMPILE_ASSERT( - kNonConflictingGroupNumber != FieldTrial::kNotFinalized, - conflicting_default_group_number); + "The 'non-conflicting' group number conflicts"); + static_assert(kNonConflictingGroupNumber != FieldTrial::kNotFinalized, + "The 'non-conflicting' group number conflicts"); *default_group_number = kNonConflictingGroupNumber; } } |