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

facontidavide · facontidavide · commit 17b347b202ea · 2024-06-18T18:21:22.000+02:00
diff --git a/include/behaviortree_cpp/controls/fallback_node.h b/include/behaviortree_cpp/controls/fallback_node.h
@@ -32,7 +32,7 @@ namespace BT
 class FallbackNode : public ControlNode
 {
 public:
-  FallbackNode(const std::string& name, bool make_aynch = false);
+  FallbackNode(const std::string& name, bool make_asynch = false);
 
   virtual ~FallbackNode() override = default;
 
diff --git a/src/controls/fallback_node.cpp b/src/controls/fallback_node.cpp
@@ -15,11 +15,11 @@
 
 namespace BT
 {
-FallbackNode::FallbackNode(const std::string& name, bool make_aynch)
+FallbackNode::FallbackNode(const std::string& name, bool make_asynch)
   : ControlNode::ControlNode(name, {})
   , current_child_idx_(0)
   , all_skipped_(true)
-  , asynch_(make_aynch)
+  , asynch_(make_asynch)
 {
   if(asynch_)
     setRegistrationID("AsyncFallback");

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace BT`
`32`	`32`	`class FallbackNode : public ControlNode`
`33`	`33`	`{`
`34`	`34`	`public:`
`35`		`- FallbackNode(const std::string& name, bool make_aynch = false);`
	`35`	`+ FallbackNode(const std::string& name, bool make_asynch = false);`
`36`	`36`
`37`	`37`	`virtual ~FallbackNode() override = default;`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`
`16`	`16`	`namespace BT`
`17`	`17`	`{`
`18`		`-FallbackNode::FallbackNode(const std::string& name, bool make_aynch)`
	`18`	`+FallbackNode::FallbackNode(const std::string& name, bool make_asynch)`
`19`	`19`	`: ControlNode::ControlNode(name, {})`
`20`	`20`	`, current_child_idx_(0)`
`21`	`21`	`, all_skipped_(true)`
`22`		`- , asynch_(make_aynch)`
	`22`	`+ , asynch_(make_asynch)`
`23`	`23`	`{`
`24`	`24`	`if(asynch_)`
`25`	`25`	`setRegistrationID("AsyncFallback");`