瀏覽代碼

Fix mismerge

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 年之前
父節點
當前提交
79837cf0bd
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      system/jlib/jstats.cpp

+ 2 - 0
system/jlib/jstats.cpp

@@ -1881,6 +1881,8 @@ CNestedRuntimeStatisticMap & CRuntimeStatisticCollection::ensureNested()
     return *querySingleton(nested, nestlock, [this]{ return this->createNested(); });
 }
 
+CriticalSection CRuntimeStatisticCollection::nestlock;
+
 unsigned __int64 CRuntimeStatisticCollection::getSerialStatisticValue(StatisticKind kind) const
 {
     unsigned __int64 value = getStatisticValue(kind);