-
-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
31 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 82f7f3de0e90bb7d1447cb710ffd2e1b315ae479 Mon Sep 17 00:00:00 2001 | ||
From: Artem Dyomin <[email protected]> | ||
Date: Fri, 26 May 2023 15:15:52 +0200 | ||
Subject: [PATCH] Remove std::unary_function usage | ||
|
||
std::unary_function was removed with c++17 | ||
|
||
Pick-to: 6.5 | ||
Task-number: QTBUG-113782 | ||
Change-Id: I4e330cd1f89dc14936acbccdeee8378ea4938870 | ||
Reviewed-by: Lars Knoll <[email protected]> | ||
Reviewed-by: Qt CI Bot <[email protected]> | ||
Reviewed-by: Pavel Dubsky <[email protected]> | ||
--- | ||
|
||
diff --git a/src/plugins/multimedia/darwin/camera/avfcamerautility.mm b/src/plugins/multimedia/darwin/camera/avfcamerautility.mm | ||
index 4334613..fb73ba3 100644 | ||
--- a/src/plugins/multimedia/darwin/camera/avfcamerautility.mm | ||
+++ b/src/plugins/multimedia/darwin/camera/avfcamerautility.mm | ||
@@ -69,9 +69,9 @@ | ||
} | ||
}; | ||
|
||
-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool> | ||
+struct FormatHasNoFPSRange | ||
{ | ||
- bool operator() (AVCaptureDeviceFormat *format) | ||
+ bool operator() (AVCaptureDeviceFormat *format) const | ||
{ | ||
Q_ASSERT(format); | ||
return !format.videoSupportedFrameRateRanges || !format.videoSupportedFrameRateRanges.count; |