浏览代码

Merge pull request #10391 from ghalliday/issue17563

HPCC-17563 Fix compile problem on old windows compilers

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 年之前
父节点
当前提交
0861600174
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      system/jlib/jstats.cpp

+ 6 - 4
system/jlib/jstats.cpp

@@ -1678,9 +1678,10 @@ void CRuntimeStatisticCollection::merge(const CRuntimeStatisticCollection & othe
         if (value)
             mergeStatistic(kind, value);
     }
-    if (other.nested)
+    CNestedRuntimeStatisticMap *otherNested = other.queryNested();
+    if (otherNested)
     {
-        ensureNested().merge(*other.nested);
+        ensureNested().merge(*otherNested);
     }
 }
 
@@ -1705,9 +1706,10 @@ void CRuntimeStatisticCollection::updateDelta(CRuntimeStatisticCollection & targ
                 target.mergeStatistic(kind, sourceValue);
         }
     }
-    if (source.nested)
+    CNestedRuntimeStatisticMap *sourceNested = source.queryNested();
+    if (sourceNested)
     {
-        ensureNested().updateDelta(target.ensureNested(), *source.nested);
+        ensureNested().updateDelta(target.ensureNested(), *sourceNested);
     }
 }