diff options
| author | lukasza <lukasza@chromium.org> | 2015-03-30 12:02:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-30 19:03:34 +0000 |
| commit | cf9a570b457ccd2e299eff7697b95e09ca8e710e (patch) | |
| tree | abcc63103869e132a64bbd2301019529e42e2072 | |
| parent | 8272191fccbfffae4c7fa0651dbda1bfe483526c (diff) | |
| download | chromium_src-cf9a570b457ccd2e299eff7697b95e09ca8e710e.zip chromium_src-cf9a570b457ccd2e299eff7697b95e09ca8e710e.tar.gz chromium_src-cf9a570b457ccd2e299eff7697b95e09ca8e710e.tar.bz2 | |
Replace COMPILE_ASSERT with static_assert in remoting/
All our toolchains support c++'s static_assert now- COMPILE_ASSERT can be removed now.
BUG=442514
Review URL: https://codereview.chromium.org/1045823003
Cr-Commit-Position: refs/heads/master@{#322824}
| -rw-r--r-- | remoting/codec/video_encoder_vpx.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/codec/video_encoder_vpx.cc b/remoting/codec/video_encoder_vpx.cc index 73e8ee8..18700fe 100644 --- a/remoting/codec/video_encoder_vpx.cc +++ b/remoting/codec/video_encoder_vpx.cc @@ -173,7 +173,7 @@ void CreateImage(bool use_i444, // Pad the Y, U and V planes' height out to compensate. // Assuming macroblocks are 16x16, aligning the planes' strides above also // macroblock aligned them. - COMPILE_ASSERT(kMacroBlockSize == 16, macroblock_size_not_16); + static_assert(kMacroBlockSize == 16, "macroblock_size_not_16"); const int y_rows = ((image->h - 1) & ~(kMacroBlockSize-1)) + kMacroBlockSize; const int uv_rows = y_rows >> image->y_chroma_shift; |