Index: chrome/browser/extensions/api/proxy/proxy_api_constants.cc |
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_constants.cc b/chrome/browser/extensions/api/proxy/proxy_api_constants.cc |
index 3142b2f75894135d58fa95c8b31c228fa0b91c16..ad4605b2fe12b3d61ef8b634b056dbd7e6cf55f0 100644 |
--- a/chrome/browser/extensions/api/proxy/proxy_api_constants.cc |
+++ b/chrome/browser/extensions/api/proxy/proxy_api_constants.cc |
@@ -42,13 +42,13 @@ const char* const scheme_name[] = { "*error*", |
"ftp", |
"socks" }; |
-COMPILE_ASSERT(SCHEME_MAX == SCHEME_FALLBACK, |
- SCHEME_MAX_must_equal_SCHEME_FALLBACK); |
-COMPILE_ASSERT(arraysize(field_name) == SCHEME_MAX + 1, |
- field_name_array_is_wrong_size); |
-COMPILE_ASSERT(arraysize(scheme_name) == SCHEME_MAX + 1, |
- scheme_name_array_is_wrong_size); |
-COMPILE_ASSERT(SCHEME_ALL == 0, singleProxy_must_be_first_option); |
+static_assert(SCHEME_MAX == SCHEME_FALLBACK, |
+ "SCHEME_MAX must equal SCHEME_FALLBACK"); |
+static_assert(arraysize(field_name) == SCHEME_MAX + 1, |
+ "field_name array must have SCHEME_MAX + 1 elements"); |
Nico
2014/12/23 01:32:12
ditto
Mostyn Bramley-Moore
2014/12/23 08:16:37
Done.
|
+static_assert(arraysize(scheme_name) == SCHEME_MAX + 1, |
+ "scheme_name array must have SCHEME_MAX + 1 elements"); |
+static_assert(SCHEME_ALL == 0, "SCHEME_ALL must be the first value"); |
} // namespace proxy_api_constants |
} // namespace extensions |