Remove COMPILE_ASSERT and use static_assert everywhere
COMPILE_ASSERT is no longer needed now that we have C++11's
static_assert.
R=aluebs@webrtc.org, andrew@webrtc.org, hellner@chromium.org, henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39469004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8058 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/common_audio/wav_header.cc b/webrtc/common_audio/wav_header.cc
index 9776bc4..fefbee0 100644
--- a/webrtc/common_audio/wav_header.cc
+++ b/webrtc/common_audio/wav_header.cc
@@ -29,7 +29,7 @@
uint32_t ID;
uint32_t Size;
};
-COMPILE_ASSERT(sizeof(ChunkHeader) == 8, chunk_header_size);
+static_assert(sizeof(ChunkHeader) == 8, "ChunkHeader size");
// We can't nest this definition in WavHeader, because VS2013 gives an error
// on sizeof(WavHeader::fmt): "error C2070: 'unknown': illegal sizeof operand".
@@ -42,7 +42,7 @@
uint16_t BlockAlign;
uint16_t BitsPerSample;
};
-COMPILE_ASSERT(sizeof(FmtSubchunk) == 24, fmt_subchunk_size);
+static_assert(sizeof(FmtSubchunk) == 24, "FmtSubchunk size");
const uint32_t kFmtSubchunkSize = sizeof(FmtSubchunk) - sizeof(ChunkHeader);
struct WavHeader {
@@ -55,7 +55,7 @@
ChunkHeader header;
} data;
};
-COMPILE_ASSERT(sizeof(WavHeader) == kWavHeaderSize, no_padding_in_header);
+static_assert(sizeof(WavHeader) == kWavHeaderSize, "no padding in header");
} // namespace