mirror of
https://github.com/thooge/esp32-nmea2000-obp60.git
synced 2025-12-14 06:23:07 +01:00
fix merge errors
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user