diff options
| author | qsr <qsr@chromium.org> | 2015-02-09 05:52:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 13:53:16 +0000 |
| commit | 6d0be449b4c1c667a44762c9dbd0ee18ea120ade (patch) | |
| tree | 01ae362861d649f82bf55370203780e6962d88f7 /chrome | |
| parent | 1a600c7b3fdff94fa7e00656191f37fb65dd05b1 (diff) | |
| download | chromium_src-6d0be449b4c1c667a44762c9dbd0ee18ea120ade.zip chromium_src-6d0be449b4c1c667a44762c9dbd0ee18ea120ade.tar.gz chromium_src-6d0be449b4c1c667a44762c9dbd0ee18ea120ade.tar.bz2 | |
Fully qualify usage of ArraySizeHelper to prevent conflict.
mojo redefines ArraySizeHelper in the mojo namespace. When arraysize is used
in the mojo namespace, with both version in scope, the compiler, on android, is complaining that the reference is
not unique. To prevent this, qualify the usage of ArraySizeHelper in
base/macros.h
Review URL: https://codereview.chromium.org/804023002
Cr-Commit-Position: refs/heads/master@{#315290}
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/installer/mini_installer/decompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/mini_installer/decompress.h b/chrome/installer/mini_installer/decompress.h index f3627fd..c92d369 100644 --- a/chrome/installer/mini_installer/decompress.h +++ b/chrome/installer/mini_installer/decompress.h @@ -8,7 +8,7 @@ // arraysize borrowed from basictypes.h template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N]; -#define arraysize(array) (sizeof(ArraySizeHelper(array))) +#define arraysize(array) (sizeof(::ArraySizeHelper(array))) namespace mini_installer { |