| Index: webrtc/base/arraysize.h
|
| diff --git a/webrtc/base/arraysize.h b/webrtc/base/arraysize.h
|
| index 0bb0a62ed842c8b178867ab8e132e4b049cb6db2..56a10392afd8f864c30defbe10a8d5cb01724eda 100644
|
| --- a/webrtc/base/arraysize.h
|
| +++ b/webrtc/base/arraysize.h
|
| @@ -24,16 +24,7 @@
|
| // This template function declaration is used in defining arraysize.
|
| // Note that the function doesn't need an implementation, as we only
|
| // use its type.
|
| -template <typename T, size_t N>
|
| -char (&ArraySizeHelper(T (&array)[N]))[N];
|
| -
|
| -// That gcc wants both of these prototypes seems mysterious. VC, for
|
| -// its part, can't decide which to use (another mystery). Matching of
|
| -// template overloads: the final frontier.
|
| -#ifndef _MSC_VER
|
| -template <typename T, size_t N>
|
| -char (&ArraySizeHelper(const T (&array)[N]))[N];
|
| -#endif
|
| +template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N];
|
|
|
| #define arraysize(array) (sizeof(ArraySizeHelper(array)))
|
|
|
|
|