diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-10-08 17:08:48 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2018-10-08 15:33:07 +0000 |
| commit | 4b6a9b086ba762ed07408f0ac5b748ae57b3f051 (patch) | |
| tree | e28c59ce772013d3710fe6ad7b22833a5cab54e7 | |
| parent | 5ff03f54121421ebe474e93f30ae669793bb44b7 (diff) | |
Fix build on macOS with recent clang
[Backport] Drop 'const' from arguments that expect a deduced
function-ptr type
Apparently the cv-qualifier of a function type must match,
during deduction, see
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#1584
Recent Clang versions error about this so the code must be adjusted.
Bug: 840251
Reviewed-on: https://chromium-review.googlesource.com/1046588
Task-number: QTBUG-70981
Change-Id: I4f538e192745c1b2f6bb893441d52a06684028c7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/media/audio/mac/coreaudio_dispatch_override.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/media/audio/mac/coreaudio_dispatch_override.cc b/chromium/media/audio/mac/coreaudio_dispatch_override.cc index 30b4e2c340f..2ac812b0f3f 100644 --- a/chromium/media/audio/mac/coreaudio_dispatch_override.cc +++ b/chromium/media/audio/mac/coreaudio_dispatch_override.cc @@ -16,7 +16,7 @@ namespace { struct dyld_interpose_tuple { template <typename T> - dyld_interpose_tuple(const T* replacement, const T* replacee) + dyld_interpose_tuple(T* replacement, T* replacee) : replacement(reinterpret_cast<const void*>(replacement)), replacee(reinterpret_cast<const void*>(replacee)) {} const void* replacement; |