Skip to content

Commit 1b16e25

Browse files
committed
Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP
2 parents 7b9b8bc + 49e8f30 commit 1b16e25

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

3rdparty/minitrace/minitrace.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
#ifdef _WIN32
1414
#pragma warning (disable:4996)
15+
#ifndef WIN32_LEAN_AND_MEAN
1516
#define WIN32_LEAN_AND_MEAN
17+
#endif
1618
#include <windows.h>
1719
#define __thread __declspec(thread)
1820
#define pthread_mutex_t CRITICAL_SECTION

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ example here: https://github.com/BehaviorTree/btcpp_sample .
9595
Are you using BT.CPP in your commercial product and do you need technical support / consulting?
9696
You can contact the primary author, **dfaconti@aurynrobotics.com**, to discuss your use case and needs.
9797

98+
# Star History
99+
100+
[![Star History Chart](https://api.star-history.com/svg?repos=BehaviorTree/BehaviorTree.CPP&type=Date)](https://star-history.com/#BehaviorTree/BehaviorTree.CPP&Date)
101+
102+
98103
# License
99104

100105
The MIT License (MIT)

include/behaviortree_cpp/blackboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class Blackboard
143143
// this is not the first time we set this entry, we need to check
144144
// if the type is the same or not.
145145
Entry& entry = *it->second;
146-
std::scoped_lock lock(entry.entry_mutex);
146+
std::scoped_lock scoped_lock(entry.entry_mutex);
147147

148148
Any& previous_any = entry.value;
149149

0 commit comments

Comments
 (0)