Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: crypto/nss_util.cc

Issue 863253002: Update from https://crrev.com/312600 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months 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 | « cc/trees/thread_proxy.cc ('k') | gpu/GLES2/gl2chromium_autogen.h » ('j') | testing/test.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 02c932711968761233e0217bea0ccf3507ffbff6..5ee7c320f5c04cc84472d3b43a5cb07ab9346576 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")) {
« no previous file with comments | « cc/trees/thread_proxy.cc ('k') | gpu/GLES2/gl2chromium_autogen.h » ('j') | testing/test.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698