diff options
| author | pennymac <pennymac@chromium.org> | 2014-12-29 13:49:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-29 21:50:38 +0000 |
| commit | da9d12af3c9a29fdbf41af975c5bb93fdc7b8138 (patch) | |
| tree | 9b7672be3d52a5e45d2f5725dcbeeaa1fedd4c7e /chrome/installer/setup | |
| parent | ea2764dfb4d626c3f3c83f4248ac11bf5b0bfd0e (diff) | |
| download | chromium_src-da9d12af3c9a29fdbf41af975c5bb93fdc7b8138.zip chromium_src-da9d12af3c9a29fdbf41af975c5bb93fdc7b8138.tar.gz chromium_src-da9d12af3c9a29fdbf41af975c5bb93fdc7b8138.tar.bz2 | |
Revert of replace COMPILE_ASSERT with static_assert in chrome/installer/ (patchset #1 id:1 of https://codereview.chromium.org/821673004/)
Reason for revert:
Changes breaks internal signing infrastructure (static_assert not defined in environment somehow).
Maybe after the holidays, we can revisit!
Original issue's description:
> replace COMPILE_ASSERT with static_assert in chrome/installer/
>
> BUG=442514
>
> Committed: https://crrev.com/b4aadc32a7fd6d42ac3cc9adbb20a8ee4a267572
> Cr-Commit-Position: refs/heads/master@{#309684}
TBR=gab@chromium.org,mostynb@opera.com
NOTREECHECKS=true
NOTRY=true
BUG=442514
Review URL: https://codereview.chromium.org/833513002
Cr-Commit-Position: refs/heads/master@{#309720}
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 44ec7d8..9017b33 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -1500,9 +1500,9 @@ InstallStatus InstallProductsHelper(const InstallationState& original_state, } uint32 higher_products = 0; - static_assert( + COMPILE_ASSERT( sizeof(higher_products) * 8 > BrowserDistribution::NUM_TYPES, - "too many distribution types"); + too_many_distribution_types_); const Products& products = installer_state.products(); for (Products::const_iterator it = products.begin(); it < products.end(); ++it) { @@ -1520,8 +1520,8 @@ InstallStatus InstallProductsHelper(const InstallationState& original_state, } if (higher_products != 0) { - static_assert(BrowserDistribution::NUM_TYPES == 4, - "add support for new products here"); + COMPILE_ASSERT(BrowserDistribution::NUM_TYPES == 4, + add_support_for_new_products_here_); const uint32 kBrowserBit = 1 << BrowserDistribution::CHROME_BROWSER; int message_id = 0; |