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

Timestamp:

Jul 12, 2020 1:14:44 PM (5 years ago)

Author:

vboxsync

Message:

Main/PerformanceImpl.cpp: C++11 deprecated std::mem_fun -> std::mem_fn, hoping that's the right conversion... Some signed/unsigned conversion issues. bugref:9790

File:

• trunk/src/VBox/Main/src-server/PerformanceImpl.cpp (modified) (11 diffs)

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

@@ -322 +322 @@
 
     aMetrics.resize(filteredMetrics.size());
-    int i = 0;
+    size_t i = 0;
     for (it = filteredMetrics.begin(); it != filteredMetrics.end(); ++it)
     {
@@ -330 +330 @@
             rc = metric->init(*it);
         AssertComRCReturnRC(rc);
-        LogFlow(("PerformanceCollector::GetMetrics() store a metric at retMetrics[%d]...\n", i));
+        LogFlow(("PerformanceCollector::GetMetrics() store a metric at retMetrics[%zu]...\n", i));
         aMetrics[i++] = metric;
     }
@@ -375 +375 @@
 
     aAffectedMetrics.resize(filteredMetrics.size());
-    int i = 0;
+    size_t i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
@@ -409 +409 @@
 
     aAffectedMetrics.resize(filteredMetrics.size());
-    int i = 0;
+    size_t i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
@@ -445 +445 @@
 
     aAffectedMetrics.resize(filteredMetrics.size());
-    int i = 0;
+    size_t i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
@@ -484 +484 @@
         }
 
-    int i = 0;
     size_t flatIndex = 0;
     size_t numberOfMetrics = filteredMetrics.size();
@@ -496 +495 @@
     aReturnData.resize(flatSize);
 
+    size_t i = 0;
     for (it = filteredMetrics.begin(); it != filteredMetrics.end(); ++it, ++i)
     {
@@ -699 +699 @@
      */
     Log7Func(("{%p}: before remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
+#if RT_CPLUSPLUS_PREREQ(201100) /* mem_fun is deprecated in C++11 and removed in C++17 */
+    toBeCollected.remove_if(std::mem_fn(&pm::BaseMetric::isUnregistered));
+#else
     toBeCollected.remove_if(std::mem_fun(&pm::BaseMetric::isUnregistered));
+#endif
     Log7Func(("{%p}: after remove_if: toBeCollected.size()=%d\n", this, toBeCollected.size()));
     Log7Func(("{%p}: before remove_if: m.baseMetrics.size()=%d\n", this, m.baseMetrics.size()));
@@ -719 +723 @@
 
     /* Finally, collect the data */
-    std::for_each(toBeCollected.begin(), toBeCollected.end(),
-                  std::mem_fun(&pm::BaseMetric::collect));
+#if RT_CPLUSPLUS_PREREQ(201100) /* mem_fun is deprecated in C++11 and removed in C++17 */
+    std::for_each(toBeCollected.begin(), toBeCollected.end(), std::mem_fn(&pm::BaseMetric::collect));
+#else
+    std::for_each(toBeCollected.begin(), toBeCollected.end(), std::mem_fun(&pm::BaseMetric::collect));
+#endif
     Log4Func(("{%p}: LEAVE\n", this));
 }
@@ -770 +777 @@
     m.count       = aMetric->getLength();
     m.unit        = aMetric->getUnit();
-    m.min         = aMetric->getMinValue();
-    m.max         = aMetric->getMaxValue();
+    /** @todo r=bird: LONG/ULONG mixup.   */
+    m.min         = (LONG)aMetric->getMinValue();
+    m.max         = (LONG)aMetric->getMaxValue();
 
     autoInitSpan.setSucceeded();
@@ -789 +797 @@
     m.count       = aMetric->getLength();
     m.unit        = aMetric->getUnit();
-    m.min         = aMetric->getMinValue();
-    m.max         = aMetric->getMaxValue();
+    /** @todo r=bird: LONG/ULONG mixup.   */
+    m.min         = (LONG)aMetric->getMinValue();
+    m.max         = (LONG)aMetric->getMaxValue();
 
     autoInitSpan.setSucceeded();