diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/crypto/cssm_init.h | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
| download | qtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/crypto/cssm_init.h')
| -rw-r--r-- | chromium/crypto/cssm_init.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chromium/crypto/cssm_init.h b/chromium/crypto/cssm_init.h index 3eece1b9c3b..a4da34aad2b 100644 --- a/chromium/crypto/cssm_init.h +++ b/chromium/crypto/cssm_init.h @@ -12,6 +12,11 @@ namespace crypto { +// CSSM functions are deprecated as of OSX 10.7, but have no replacement. +// https://bugs.chromium.org/p/chromium/issues/detail?id=590914#c1 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + // Initialize CSSM if it isn't already initialized. This must be called before // any other CSSM functions. This function is thread-safe, and CSSM will only // ever be initialized once. CSSM will be properly shut down on program exit. @@ -55,6 +60,8 @@ class ScopedCSSMData { DISALLOW_COPY_AND_ASSIGN(ScopedCSSMData); }; +#pragma clang diagnostic pop // "-Wdeprecated-declarations" + } // namespace crypto #endif // CRYPTO_CSSM_INIT_H_ |