Pārlūkot izejas kodu

Fix mismerge

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 gadi atpakaļ
vecāks
revīzija
79837cf0bd
1 mainītis faili ar 2 papildinājumiem un 0 dzēšanām
  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);