Merge branch 'main' into small-fixes

1 files changed, 5 insertions, 5 deletions

diff --git a/source/game/StarBehaviorState.cpp b/source/game/StarBehaviorState.cpp
index 39a800e..c6001af 100644
--- a/source/game/StarBehaviorState.cpp
+++ b/source/game/StarBehaviorState.cpp
@@ -17,7 +17,7 @@ List<NodeParameterType> BlackboardTypes = {
   NodeParameterType::String
 };
 
-Blackboard::Blackboard(LuaTable luaContext) : m_luaContext(move(luaContext)) {
+Blackboard::Blackboard(LuaTable luaContext) : m_luaContext(std::move(luaContext)) {
   for (auto type : BlackboardTypes) {
     m_board.set(type, {});
     m_input.set(type, {});
@@ -118,20 +118,20 @@ void Blackboard::clearEphemerals(Set<pair<NodeParameterType, String>> ephemerals
   }
 }
 
-DecoratorState::DecoratorState(LuaThread thread) : thread(move(thread)) {
-  child = make_shared<NodeState>();
+DecoratorState::DecoratorState(LuaThread thread) : thread(std::move(thread)) {
+  child = std::make_shared<NodeState>();
 }
 
 CompositeState::CompositeState(size_t childCount) : index() {
   for (size_t i = 0; i < childCount; i++)
-    children.append(make_shared<NodeState>());
+    children.append(std::make_shared<NodeState>());
 }
 
 CompositeState::CompositeState(size_t childCount, size_t begin) : CompositeState(childCount) {
   index = begin;
 }
 
-BehaviorState::BehaviorState(BehaviorTreeConstPtr tree, LuaTable context, Maybe<BlackboardWeakPtr> blackboard) : m_tree(tree), m_luaContext(move(context)) {
+BehaviorState::BehaviorState(BehaviorTreeConstPtr tree, LuaTable context, Maybe<BlackboardWeakPtr> blackboard) : m_tree(tree), m_luaContext(std::move(context)) {
   if (blackboard)
     m_board = *blackboard;
   else