Skip to content

Commit dd6f6c4

Browse files
shmpwkKhalilSelyan
authored and
KhalilSelyan
committed
fix(autoware_auto_common): nullptr_t (#7212)
Signed-off-by: Shumpei Wakabayashi <shumpei.wakabayashi@tier4.jp>
1 parent 53bd16a commit dd6f6c4

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

common/autoware_auto_common/include/autoware_auto_common/helper_functions/message_adapters.hpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ using TimeStamp = builtin_interfaces::msg::Time;
3636

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

4949
/////////// Template declarations
5050

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

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

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

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

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

92-
template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
92+
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
9393
std::string & get_frame_id(T & msg) noexcept
9494
{
9595
return msg.header.frame_id;
9696
}
9797

98-
template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
98+
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
9999
TimeStamp & get_stamp(T & msg) noexcept
100100
{
101101
return msg.header.stamp;
102102
}
103103

104-
template <class T, typename std::enable_if<HasHeader<T>::value, nullptr_t>::type = nullptr>
104+
template <class T, typename std::enable_if<HasHeader<T>::value, std::nullptr_t>::type = nullptr>
105105
TimeStamp get_stamp(const T & msg) noexcept
106106
{
107107
return msg.header.stamp;

0 commit comments

Comments
 (0)