Skip to content

Commit 10fa55f

Browse files
committed
fix CI
1 parent 43c2f2d commit 10fa55f

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

include/behaviortree_cpp/action_node.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ using AsyncActionNode = ThreadedActionNode;
155155
*
156156
* -) if halted, method onHalted() is invoked
157157
*/
158-
class StatefulAsyncAction : public ActionNodeBase
158+
class StatefulActionNode : public ActionNodeBase
159159
{
160160
public:
161-
StatefulAsyncAction(const std::string& name, const NodeConfig& config) :
161+
StatefulActionNode(const std::string& name, const NodeConfig& config) :
162162
ActionNodeBase(name, config)
163163
{}
164164

@@ -185,8 +185,6 @@ class StatefulAsyncAction : public ActionNodeBase
185185
std::atomic_bool halt_requested_;
186186
};
187187

188-
// old name, for backward compatibility
189-
using StatefulActionNode = StatefulAsyncAction;
190188

191189
#ifndef BT_NO_COROUTINES
192190

sample_nodes/movebase_node.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ Pose2D convertFromString(StringView key)
4040
namespace chr = std::chrono;
4141

4242
// This is an asynchronous operation
43-
class MoveBaseAction : public BT::StatefulAsyncAction
43+
class MoveBaseAction : public BT::StatefulActionNode
4444
{
4545
public:
4646
// Any TreeNode with ports must have a constructor with this signature
4747
MoveBaseAction(const std::string& name, const BT::NodeConfig& config)
48-
: StatefulAsyncAction(name, config)
48+
: StatefulActionNode(name, config)
4949
{}
5050

5151
// It is mandatory to define this static method.

src/action_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void CoroActionNode::halt()
121121
}
122122
#endif
123123

124-
bool StatefulAsyncAction::isHaltRequested() const
124+
bool StatefulActionNode::isHaltRequested() const
125125
{
126126
return halt_requested_.load();
127127
}

src/bt_factory.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ std::vector<std::string> getCatkinLibraryPaths()
186186
{
187187
std::filesystem::path path(static_cast<std::string>(catkin_prefix_path));
188188
std::filesystem::path lib("lib");
189-
lib_paths.push_back((path / lib).str());
189+
lib_paths.push_back((path / lib).string());
190190
}
191191
}
192192
return lib_paths;
@@ -206,8 +206,8 @@ void BehaviorTreeFactory::registerFromROSPlugins()
206206
const auto full_path = std::filesystem::path(lib_path) / filename;
207207
if (full_path.exists())
208208
{
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());
211211
break;
212212
}
213213
}

0 commit comments

Comments
 (0)