| commit | 91164e7f94030b3e49a31d88c91d70d4bd358ebe | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Tue Mar 15 15:55:01 2016 -0700 |
| committer | Glenn Kasten <gkasten@google.com> | Mon Mar 13 09:01:58 2017 -0700 |
| tree | 7dd1d0ea1f841ff949f0fb40afef6471d15690ea | |
| parent | 0e4b8e9cb1b422195c49be49b48d039aa0814acf [diff] [blame] |
Use static_assert instead of COMPILE_TIME_ASSERT_FUNCTION_SCOPE Test: builds OK Change-Id: I5923dce96e43d7107f1d8e3145ad4bb5eca261e7
diff --git a/media/libaudioprocessing/AudioResamplerFirProcessSSE.h b/media/libaudioprocessing/AudioResamplerFirProcessSSE.h index 63ed052..30233b5 100644 --- a/media/libaudioprocessing/AudioResamplerFirProcessSSE.h +++ b/media/libaudioprocessing/AudioResamplerFirProcessSSE.h
@@ -47,7 +47,7 @@ const float* coefsN1) { ALOG_ASSERT(count > 0 && (count & 7) == 0); // multiple of 8 - COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS == 1 || CHANNELS == 2); + static_assert(CHANNELS == 1 || CHANNELS == 2, "CHANNELS must be 1 or 2"); sP -= CHANNELS*(4-1); // adjust sP for a loop iteration of four