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

Unified Diff: content/renderer/render_view_impl_android.cc

Issue 791923003: replace COMPILE_ASSERT with static_assert in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixups 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 | « content/renderer/pepper/pepper_video_capture_host.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl_android.cc
diff --git a/content/renderer/render_view_impl_android.cc b/content/renderer/render_view_impl_android.cc
index 50b10aa56672186ed97dffeb74168a3a27eb2380..dc74a3aff3d29b018a4ecc9002a19dabae3a8592 100644
--- a/content/renderer/render_view_impl_android.cc
+++ b/content/renderer/render_view_impl_android.cc
@@ -14,12 +14,12 @@
namespace content {
// Check content::TopControlsState and cc::TopControlsState are kept in sync.
-COMPILE_ASSERT(int(TOP_CONTROLS_STATE_SHOWN) == int(cc::SHOWN),
- mismatching_enums);
-COMPILE_ASSERT(int(TOP_CONTROLS_STATE_HIDDEN) == int(cc::HIDDEN),
- mismatching_enums);
-COMPILE_ASSERT(int(TOP_CONTROLS_STATE_BOTH) == int(cc::BOTH),
- mismatching_enums);
+static_assert(int(TOP_CONTROLS_STATE_SHOWN) == int(cc::SHOWN),
+ "mismatching enums: SHOWN");
+static_assert(int(TOP_CONTROLS_STATE_HIDDEN) == int(cc::HIDDEN),
+ "mismatching enums: HIDDEN");
+static_assert(int(TOP_CONTROLS_STATE_BOTH) == int(cc::BOTH),
+ "mismatching enums: BOTH");
cc::TopControlsState ContentToCcTopControlsState(
TopControlsState state) {
« no previous file with comments | « content/renderer/pepper/pepper_video_capture_host.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698