Skip to content

Commit 67774d6

Browse files
committed
Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP
2 parents 39b8bf7 + dc20a5e commit 67774d6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/behaviortree_cpp/loggers/groot2_protocol.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ struct Hook
222222
};
223223

224224

225-
void to_json(nlohmann::json& js, const Hook& bp) {
225+
inline void to_json(nlohmann::json& js, const Hook& bp) {
226226
js = nlohmann::json {
227227
{"enabled", bp.enabled},
228228
{"uid", bp.node_uid},
@@ -233,7 +233,7 @@ void to_json(nlohmann::json& js, const Hook& bp) {
233233
};
234234
}
235235

236-
void from_json(const nlohmann::json& js, Hook& bp) {
236+
inline void from_json(const nlohmann::json& js, Hook& bp) {
237237
js.at("enabled").get_to(bp.enabled);
238238
js.at("uid").get_to(bp.node_uid);
239239
js.at("once").get_to(bp.remove_when_done);

0 commit comments

Comments
 (0)