fix merge errors

This commit is contained in:
andreas 2024-11-25 16:50:32 +01:00
parent f9a001a9c2
commit 243c20c468
1 changed files with 0 additions and 3 deletions

View File

@ -90,7 +90,6 @@ class TaskInterfacesStorage{
return true;
}
GwApi::TaskInterfaces::Ptr get(const String &name, int &result){
GWSYNCHRONIZED(lock);
GWSYNCHRONIZED(lock);
auto it = values.find(name);
if (it == values.end())
@ -245,7 +244,6 @@ public:
}
};
virtual int getJsonSize(){
GWSYNCHRONIZED(localLock);
GWSYNCHRONIZED(localLock);
if (! counterUsed) return 0;
int rt=0;
@ -255,7 +253,6 @@ public:
return rt;
};
virtual void increment(int idx,const String &name,bool failed=false){
GWSYNCHRONIZED(localLock);
GWSYNCHRONIZED(localLock);
counterUsed=true;
auto it=counter.find(idx);