Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-15 15:51:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-15 16:03:51 +0300
commitf0c991a380e9d449ebc02cc91649ef3728848070 (patch)
tree52b32ea8839229ddbcf1eb9c6c7ada30bed17804 /source/blender/blenlib/BLI_map.h
parent924fe50e97cd4cc130d96f0c4f23664052c31458 (diff)
Cleanup: work around clang-format differences between versions
Ref T73747
Diffstat (limited to 'source/blender/blenlib/BLI_map.h')
-rw-r--r--source/blender/blenlib/BLI_map.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/blenlib/BLI_map.h b/source/blender/blenlib/BLI_map.h
index 73b731252b6..6971f9d362e 100644
--- a/source/blender/blenlib/BLI_map.h
+++ b/source/blender/blenlib/BLI_map.h
@@ -637,16 +637,15 @@ template<typename KeyT, typename ValueT, typename Allocator = GuardedAllocator>
template<typename ForwardKeyT, typename ForwardValueT>
bool add_override__impl(ForwardKeyT &&key, ForwardValueT &&value)
{
- return this->add_or_modify(
- std::forward<ForwardKeyT>(key),
- [&](ValueT *dst) {
- new (dst) ValueT(std::forward<ForwardValueT>(value));
- return true;
- },
- [&](ValueT *old_value) {
- *old_value = std::forward<ForwardValueT>(value);
- return false;
- });
+ auto create_func = [&](ValueT *dst) {
+ new (dst) ValueT(std::forward<ForwardValueT>(value));
+ return true;
+ };
+ auto modify_func = [&](ValueT *old_value) {
+ *old_value = std::forward<ForwardValueT>(value);
+ return false;
+ };
+ return this->add_or_modify(std::forward<ForwardKeyT>(key), create_func, modify_func);
}
template<typename ForwardKeyT, typename ForwardValueT>