Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP

BehaviorTree · Dec 13, 2023 · 1b16e25 · 1b16e25
2 parents 7b9b8bc + 49e8f30
commit 1b16e25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/3rdparty/minitrace/minitrace.cpp b/3rdparty/minitrace/minitrace.cpp
@@ -12,7 +12,9 @@
 
 #ifdef _WIN32
 #pragma warning (disable:4996)
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #define __thread __declspec(thread)
 #define pthread_mutex_t CRITICAL_SECTION

diff --git a/README.md b/README.md
@@ -95,6 +95,11 @@ example here: https://github.com/BehaviorTree/btcpp_sample .
 Are you using BT.CPP in your commercial product and do you need technical support / consulting?
 You can contact the primary author, **dfaconti@aurynrobotics.com**, to discuss your use case and needs.
 
+# Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=BehaviorTree/BehaviorTree.CPP&type=Date)](https://star-history.com/#BehaviorTree/BehaviorTree.CPP&Date)
+
+
 # License
 
 The MIT License (MIT)

diff --git a/include/behaviortree_cpp/blackboard.h b/include/behaviortree_cpp/blackboard.h
@@ -143,7 +143,7 @@ class Blackboard
       // this is not the first time we set this entry, we need to check
       // if the type is the same or not.
       Entry& entry = *it->second;
-      std::scoped_lock lock(entry.entry_mutex);
+      std::scoped_lock scoped_lock(entry.entry_mutex);
 
       Any& previous_any = entry.value;