Use static_assert instead of COMPILE_TIME_ASSERT_FUNCTION_SCOPE
Test: builds OK
Change-Id: I5923dce96e43d7107f1d8e3145ad4bb5eca261e7
diff --git a/media/libaudioprocessing/AudioResamplerFirProcess.h b/media/libaudioprocessing/AudioResamplerFirProcess.h
index 176202e..a741677 100644
--- a/media/libaudioprocessing/AudioResamplerFirProcess.h
+++ b/media/libaudioprocessing/AudioResamplerFirProcess.h
@@ -186,7 +186,7 @@
TINTERP lerpP,
const TO* const volumeLR)
{
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS > 0)
+ static_assert(CHANNELS > 0, "CHANNELS must be > 0");
if (CHANNELS > 2) {
// TO accum[CHANNELS];
diff --git a/media/libaudioprocessing/AudioResamplerFirProcessNeon.h b/media/libaudioprocessing/AudioResamplerFirProcessNeon.h
index 1ce76a8..c335050 100644
--- a/media/libaudioprocessing/AudioResamplerFirProcessNeon.h
+++ b/media/libaudioprocessing/AudioResamplerFirProcessNeon.h
@@ -83,7 +83,7 @@
const int16_t* 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*((STRIDE>>1)-1);
coefsP = (const int16_t*)__builtin_assume_aligned(coefsP, 16);
@@ -191,7 +191,7 @@
const int32_t* 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*((STRIDE>>1)-1);
coefsP = (const int32_t*)__builtin_assume_aligned(coefsP, 16);
@@ -366,7 +366,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*((STRIDE>>1)-1);
coefsP = (const float*)__builtin_assume_aligned(coefsP, 16);
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
diff --git a/services/audioflinger/FastMixerDumpState.h b/services/audioflinger/FastMixerDumpState.h
index 301c5b1..8ef31d1 100644
--- a/services/audioflinger/FastMixerDumpState.h
+++ b/services/audioflinger/FastMixerDumpState.h
@@ -35,7 +35,7 @@
// This packed representation is used to keep the information atomic.
union FastTrackUnderruns {
FastTrackUnderruns() { mAtomic = 0;
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(sizeof(FastTrackUnderruns) == sizeof(uint32_t)); }
+ static_assert(sizeof(FastTrackUnderruns) == sizeof(uint32_t), "FastTrackUnderrun"); }
FastTrackUnderruns(const FastTrackUnderruns& copyFrom) : mAtomic(copyFrom.mAtomic) { }
FastTrackUnderruns& operator=(const FastTrackUnderruns& rhs)
{ if (this != &rhs) mAtomic = rhs.mAtomic; return *this; }