From 811a5ec446527992c71e727a4e7eed25bfa6c707 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Wed, 28 Oct 2015 10:58:19 -0700 Subject: [PATCH] pass clangcl compile options to ignore warnings in gflags.cc R=ajm@chromium.org, ajm@google.com BUG=libyuv:513,webrtc:760 Review URL: https://codereview.chromium.org/1427643003 . --- README.chromium | 2 +- include/libyuv/version.h | 2 +- third_party/gflags/gflags.gyp | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README.chromium b/README.chromium index 6c38ea296..a8c8ec6af 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1526 +Version: 1527 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 270bba627..c11017af2 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1526 +#define LIBYUV_VERSION 1527 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/third_party/gflags/gflags.gyp b/third_party/gflags/gflags.gyp index 9c11e75a4..57567fa3b 100644 --- a/third_party/gflags/gflags.gyp +++ b/third_party/gflags/gflags.gyp @@ -63,6 +63,18 @@ }], # TODO(andrew): Look into fixing this warning upstream: # http://code.google.com/p/webrtc/issues/detail?id=760 + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions!': [ + '-Wheader-hygiene', # Suppress warning about using namespace. + ], + 'AdditionalOptions': [ + '-Wno-unused-local-typedef', # Suppress unused private typedef. + ], + }, + }, + }], ['clang==1', { 'cflags!': ['-Wheader-hygiene',], 'xcode_settings': {