diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /ipc/chromium/src/base | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'ipc/chromium/src/base')
| -rw-r--r-- | ipc/chromium/src/base/hash_tables.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ipc/chromium/src/base/hash_tables.h b/ipc/chromium/src/base/hash_tables.h index 956cadb3d..9e8d6b110 100644 --- a/ipc/chromium/src/base/hash_tables.h +++ b/ipc/chromium/src/base/hash_tables.h @@ -31,18 +31,14 @@ #ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wshadow" -# if MOZ_GCC_VERSION_AT_LEAST(4, 9, 0) -# pragma GCC diagnostic ignored "-Wshadow-local" -# endif +# pragma GCC diagnostic ignored "-Wshadow-local" #endif #include <hash_map> #include <hash_set> #ifdef __GNUC__ -# if MOZ_GCC_VERSION_AT_LEAST(4, 9, 0) -# pragma GCC diagnostic pop // -Wshadow-local -# endif +# pragma GCC diagnostic pop // -Wshadow-local # pragma GCC diagnostic pop // -Wshadow #endif |