File tree Expand file tree Collapse file tree 4 files changed +8
-10
lines changed Expand file tree Collapse file tree 4 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -155,10 +155,10 @@ using AsyncActionNode = ThreadedActionNode;
155
155
*
156
156
* -) if halted, method onHalted() is invoked
157
157
*/
158
- class StatefulAsyncAction : public ActionNodeBase
158
+ class StatefulActionNode : public ActionNodeBase
159
159
{
160
160
public:
161
- StatefulAsyncAction (const std::string& name, const NodeConfig& config) :
161
+ StatefulActionNode (const std::string& name, const NodeConfig& config) :
162
162
ActionNodeBase (name, config)
163
163
{}
164
164
@@ -185,8 +185,6 @@ class StatefulAsyncAction : public ActionNodeBase
185
185
std::atomic_bool halt_requested_;
186
186
};
187
187
188
- // old name, for backward compatibility
189
- using StatefulActionNode = StatefulAsyncAction;
190
188
191
189
#ifndef BT_NO_COROUTINES
192
190
Original file line number Diff line number Diff line change @@ -40,12 +40,12 @@ Pose2D convertFromString(StringView key)
40
40
namespace chr = std::chrono;
41
41
42
42
// This is an asynchronous operation
43
- class MoveBaseAction : public BT ::StatefulAsyncAction
43
+ class MoveBaseAction : public BT ::StatefulActionNode
44
44
{
45
45
public:
46
46
// Any TreeNode with ports must have a constructor with this signature
47
47
MoveBaseAction (const std::string& name, const BT::NodeConfig& config)
48
- : StatefulAsyncAction (name, config)
48
+ : StatefulActionNode (name, config)
49
49
{}
50
50
51
51
// It is mandatory to define this static method.
Original file line number Diff line number Diff line change @@ -121,7 +121,7 @@ void CoroActionNode::halt()
121
121
}
122
122
#endif
123
123
124
- bool StatefulAsyncAction ::isHaltRequested () const
124
+ bool StatefulActionNode ::isHaltRequested () const
125
125
{
126
126
return halt_requested_.load ();
127
127
}
Original file line number Diff line number Diff line change @@ -186,7 +186,7 @@ std::vector<std::string> getCatkinLibraryPaths()
186
186
{
187
187
std::filesystem::path path (static_cast <std::string>(catkin_prefix_path));
188
188
std::filesystem::path lib (" lib" );
189
- lib_paths.push_back ((path / lib).str ());
189
+ lib_paths.push_back ((path / lib).string ());
190
190
}
191
191
}
192
192
return lib_paths;
@@ -206,8 +206,8 @@ void BehaviorTreeFactory::registerFromROSPlugins()
206
206
const auto full_path = std::filesystem::path (lib_path) / filename;
207
207
if (full_path.exists ())
208
208
{
209
- std::cout << " Registering ROS plugins from " << full_path.str () << std::endl;
210
- registerFromPlugin (full_path.str ());
209
+ std::cout << " Registering ROS plugins from " << full_path.string () << std::endl;
210
+ registerFromPlugin (full_path.string ());
211
211
break ;
212
212
}
213
213
}
You can’t perform that action at this time.
0 commit comments