Skip to content

Commit

Permalink
Merge branch 'awf-latest' into RT1-6335-route-handler-overlap-removal…
Browse files Browse the repository at this point in the history
…-is-too-conservative
  • Loading branch information
mkquda committed Jun 3, 2024
2 parents 27ecddd + 1b7c600 commit a7cf3b6
Show file tree
Hide file tree
Showing 110 changed files with 735 additions and 6,945 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
### Automatically generated from package.xml ###
common/autoware_ad_api_specs/** [email protected] [email protected]
common/autoware_auto_common/** [email protected] [email protected] [email protected] [email protected]
common/autoware_auto_geometry/** [email protected]
common/autoware_auto_perception_rviz_plugin/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
common/autoware_auto_tf2/** [email protected] [email protected] [email protected] [email protected]
common/autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/** [email protected]
Expand Down
4 changes: 0 additions & 4 deletions common/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ nav:
- 'Common Libraries':
- 'autoware_auto_common':
- 'comparisons': common/autoware_auto_common/design/comparisons
- 'autoware_auto_geometry':
- 'interval': common/autoware_auto_geometry/design/interval
- 'polygon intersection 2d': common/autoware_auto_geometry/design/polygon_intersection_2d-design
- 'spatial hash': common/autoware_auto_geometry/design/spatial-hash-design
- 'autoware_auto_tf2': common/autoware_auto_tf2/design/autoware-auto-tf2-design
- 'autoware_point_types': common/autoware_point_types
- 'Cuda Utils': common/cuda_utils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using TimeStamp = builtin_interfaces::msg::Time;

/// \brief Helper class to check existence of header file in compile time:
/// https://stackoverflow.com/a/16000226/2325407
template <typename T, typename = nullptr_t>
template <typename T, typename = std::nullptr_t>
struct HasHeader : std::false_type
{
};
Expand All @@ -48,60 +48,60 @@ struct HasHeader<T, decltype((void)T::header, nullptr)> : std::true_type

/////////// Template declarations

/// Get frame id from message. nullptr_t is used to prevent template ambiguity on
/// Get frame id from message. std::nullptr_t is used to prevent template ambiguity on
/// SFINAE specializations. Provide a default value on specializations for a friendly API.
/// \tparam T Message type.
/// \param msg Message.
/// \return Frame id of the message.
template <typename T, nullptr_t>
template <typename T, std::nullptr_t>
const std::string & get_frame_id(const T & msg) noexcept;

/// Get a reference to the frame id from message. nullptr_t is used to prevent
/// Get a reference to the frame id from message. std::nullptr_t is used to prevent
/// template ambiguity on SFINAE specializations. Provide a default value on
/// specializations for a friendly API.
/// \tparam T Message type.
/// \param msg Message.
/// \return Frame id of the message.
template <typename T, nullptr_t>
template <typename T, std::nullptr_t>
std::string & get_frame_id(T & msg) noexcept;

/// Get stamp from message. nullptr_t is used to prevent template ambiguity on
/// Get stamp from message. std::nullptr_t is used to prevent template ambiguity on
/// SFINAE specializations. Provide a default value on specializations for a friendly API.
/// \tparam T Message type.
/// \param msg Message.
/// \return Frame id of the message.
template <typename T, nullptr_t>
template <typename T, std::nullptr_t>
const TimeStamp & get_stamp(const T & msg) noexcept;

/// Get a reference to the stamp from message. nullptr_t is used to prevent
/// Get a reference to the stamp from message. std::nullptr_t is used to prevent
/// template ambiguity on SFINAE specializations. Provide a default value on
/// specializations for a friendly API.
/// \tparam T Message type.
/// \param msg Message.
/// \return Frame id of the message.
template <typename T, nullptr_t>
template <typename T, std::nullptr_t>
TimeStamp & get_stamp(T & msg) noexcept;

/////////////// Default specializations for message types that contain a header.
template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
const std::string & get_frame_id(const T & msg) noexcept
{
return msg.header.frame_id;
}

template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
std::string & get_frame_id(T & msg) noexcept
{
return msg.header.frame_id;
}

template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
TimeStamp & get_stamp(T & msg) noexcept
{
return msg.header.stamp;
}

template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
TimeStamp get_stamp(const T & msg) noexcept
{
return msg.header.stamp;
Expand Down
39 changes: 0 additions & 39 deletions common/autoware_auto_geometry/CMakeLists.txt

This file was deleted.

111 changes: 0 additions & 111 deletions common/autoware_auto_geometry/design/interval.md

This file was deleted.

This file was deleted.

Loading

0 comments on commit a7cf3b6

Please sign in to comment.