diff options
| author | anujk.sharma <anujk.sharma@samsung.com> | 2015-01-21 18:35:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-22 02:36:15 +0000 |
| commit | 3cec2aba36e9cef361ad822f63800c91358c5c1d (patch) | |
| tree | b7a7e22302630428723bcfba360638c6efc02351 /crypto/nss_util.cc | |
| parent | 0052825251b5523c2d422c04651c376d97888dac (diff) | |
| download | chromium_src-3cec2aba36e9cef361ad822f63800c91358c5c1d.zip chromium_src-3cec2aba36e9cef361ad822f63800c91358c5c1d.tar.gz chromium_src-3cec2aba36e9cef361ad822f63800c91358c5c1d.tar.bz2 | |
Using "static_assert" in lieu of "COMPILE_ASSERT" in crypto module
All our toolchains support c++'s static_assert now- COMPILE_ASSERT can be removed now.
BUG=442514
Review URL: https://codereview.chromium.org/860323002
Cr-Commit-Position: refs/heads/master@{#312535}
Diffstat (limited to 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 02c9327..5ee7c32 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -659,11 +659,11 @@ class NSSInitSingleton { EnsureNSPRInit(); // We *must* have NSS >= 3.14.3. - COMPILE_ASSERT( + static_assert( (NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) || (NSS_VMAJOR == 3 && NSS_VMINOR > 14) || (NSS_VMAJOR > 3), - nss_version_check_failed); + "nss version check failed"); // Also check the run-time NSS version. // NSS_VersionCheck is a >= check, not strict equality. if (!NSS_VersionCheck("3.14.3")) { |