zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove arraysize.h gcc hack and Chromium override.

Browse Source 
Part of work removing dependency on Chromium's base.

BUG=468375 (in particular comment #37)

Review URL: https://codereview.webrtc.org/1327023002

Cr-Commit-Position: refs/heads/master@{#9880}
This commit is contained in:
henrikg
2015-09-08 00:57:35 -07:00
committed by Commit bot
parent e9ad18b6e1
commit 3dfe5d3d41
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/base/arraysize.h
View File

@ -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)))

20
webrtc/overrides/webrtc/base/arraysize.h
View File

@ -1,20 +0,0 @@
/*
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
// This file overrides the inclusion of webrtc/base/arraysize.h
// We do this because in Chromium it redefines arraysize, which is already
// defined in base/macros.h.
#ifndef OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__
#define OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__
#include "base/macros.h"
#endif // OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__