From 243c20c4682206f60fd93d2f58d593056260a4ec Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 25 Nov 2024 16:50:32 +0100 Subject: [PATCH] fix merge errors --- lib/usercode/GwUserCode.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/usercode/GwUserCode.cpp b/lib/usercode/GwUserCode.cpp index 86f2f13..bbe8ad4 100644 --- a/lib/usercode/GwUserCode.cpp +++ b/lib/usercode/GwUserCode.cpp @@ -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);