Changeset 95117 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 25, 2022 8:56:27 PM (3 years ago)

Author:

vboxsync

Message:

Main/MediumImpl: std::unary_function was removed in c++17 and VC++ really does not have it in that mode, so #if our way around the two uses here (c++17).

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -69 +69 @@
 {
     /** Equality predicate for stdc++. */
-    struct EqualsTo : public std::unary_function <SnapshotRef, bool>
+    struct EqualsTo
+#if __cplusplus < 201700 /* deprecated in C++11, removed in C++17. */
+        : public std::unary_function <SnapshotRef, bool>
+#endif
     {
         explicit EqualsTo(const Guid &aSnapshotId) : snapshotId(aSnapshotId) {}
 
+#if __cplusplus < 201700 /* deprecated in C++11, removed in C++17. */
         bool operator()(const argument_type &aThat) const
+#else
+        bool operator()(const SnapshotRef &aThat) const
+#endif
         {
             return aThat.snapshotId == snapshotId;
@@ -100 +107 @@
 {
     /** Equality predicate for stdc++. */
-    struct EqualsTo : public std::unary_function <BackRef, bool>
+    struct EqualsTo
+#if __cplusplus < 201700 /* deprecated in C++11, removed in C++17. */
+        : public std::unary_function <BackRef, bool>
+#endif
     {
         explicit EqualsTo(const Guid &aMachineId) : machineId(aMachineId) {}
 
+#if __cplusplus < 201700 /* deprecated in C++11, removed in C++17. */
         bool operator()(const argument_type &aThat) const
+#else
+        bool operator()(const BackRef &aThat) const
+#endif
         {
             return aThat.machineId == machineId;