generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01:00
Code Issues Projects Releases Wiki Activity

merge changes from 1.10.2

Browse Source
This commit is contained in:
Günter Obiltschnig
2021-04-11 16:31:35 +02:00
parent 5187f9d0d2
commit cb6e801537
8 changed files with 76 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Foundation/include/Poco/AbstractCache.h
View File

@@ -176,6 +176,23 @@ public:
return result;
}
template <typename Fn>
void forEach(Fn&& fn) const
/// Iterates over all key-value pairs in the
/// cache, using a functor or lambda expression.
///
/// The given functor must take the key and value
/// as parameters. Note that the value is passed
/// as the actual value (or reference),
/// not a Poco::SharedPtr.
{
typename TMutex::ScopedLock lock(_mutex);
for (const auto& p: _data)
{
fn(p.first, *p.second);
}
}
protected:
mutable FIFOEvent<ValidArgs<TKey>> IsValid;
mutable FIFOEvent<KeySet> Replace;

4
Foundation/include/Poco/Dynamic/Pair.h
View File

@@ -189,7 +189,7 @@ public:
val.append("{ ");
Var key(_val.first());
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, _val.second());
val.append(" }");
}
@@ -338,7 +338,7 @@ public:
val.append("{ ");
Var key(_val.first());
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, _val.second());
val.append(" }");
}

16
Foundation/include/Poco/Dynamic/Struct.h
View File

@@ -339,7 +339,7 @@ public:
{
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
++it;
}
@@ -348,7 +348,7 @@ public:
val.append(", ");
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
}
val.append(" }");
@@ -525,7 +525,7 @@ public:
{
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
++it;
}
@@ -534,7 +534,7 @@ public:
val.append(", ");
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
}
val.append(" }");
@@ -711,7 +711,7 @@ public:
{
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
++it;
}
@@ -720,7 +720,7 @@ public:
val.append(", ");
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
}
val.append(" }");
@@ -897,7 +897,7 @@ public:
{
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
++it;
}
@@ -906,7 +906,7 @@ public:
val.append(", ");
Var key(it->first);
Impl::appendJSONKey(val, key);
val.append(" : ");
val.append(": ");
Impl::appendJSONValue(val, it->second);
}
val.append(" }");