Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Foxy] More Windows build fix. #1959

Merged
merged 1 commit into from
Aug 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nav2_bt_navigator/src/ros_topic_logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void RosTopicLogger::callback(
event.timestamp =
tf2_ros::toMsg(std::chrono::time_point<std::chrono::high_resolution_clock>(timestamp));
#else
event.timestamp = tf2_ros::toMsg(timestamp);
event.timestamp = tf2_ros::toMsg(tf2::TimePoint(timestamp));
#endif
event.node_name = node.name();
event.previous_status = toStr(prev_status, false);
Expand Down
1 change: 1 addition & 0 deletions nav2_costmap_2d/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>nav2_common</build_depend>

<depend>angles</depend>
<depend>geometry_msgs</depend>
<depend>laser_geometry</depend>
<depend>map_msgs</depend>
Expand Down
4 changes: 4 additions & 0 deletions nav2_dwb_controller/nav_2d_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ add_library(tf_help SHARED
src/tf_help.cpp
)

target_link_libraries(tf_help
conversions
)

ament_target_dependencies(tf_help
${dependencies}
)
Expand Down
2 changes: 1 addition & 1 deletion nav2_map_server/src/map_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ char * dirname(char * path)
/* This assignment is ill-designed but the XPG specs require to
return a string containing "." in any case no directory part is
found and so a static and constant string is required. */
path = reinterpret_cast<char *>(dot);
path = const_cast<char *>(&dot[0]);
}

return path;
Expand Down