Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: webrtc/base/arraysize.h

Issue 1327023002: Remove arraysize.h gcc hack and Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/overrides/webrtc/base/arraysize.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)))
« no previous file with comments | « no previous file | webrtc/overrides/webrtc/base/arraysize.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698