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.

Sign up for GitHub

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

apply ament_clang_format version 16 #1508

Closed
wants to merge 1 commit into from
Closed

apply ament_clang_format version 16 #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions simulation/simulation_interface/include/simulation_interface/conversions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ void toMsg(const rosgraph_msgs::Clock & proto, rosgraph_msgs::msg::Clock & time)
void toProto(const std_msgs::msg::Header & header, std_msgs::Header & proto);
void toMsg(const std_msgs::Header & proto, std_msgs::msg::Header & header);

#define DEFINE_CONVERSION(PACKAGE, TYPENAME) \
auto toProto(const PACKAGE::msg::TYPENAME &, PACKAGE::TYPENAME &)->void; \
auto toMsg(const PACKAGE::TYPENAME &, PACKAGE::msg::TYPENAME &)->void
#define DEFINE_CONVERSION(PACKAGE, TYPENAME) \
auto toProto(const PACKAGE::msg::TYPENAME &, PACKAGE::TYPENAME &) -> void; \
auto toMsg(const PACKAGE::TYPENAME &, PACKAGE::msg::TYPENAME &) -> void

DEFINE_CONVERSION(autoware_control_msgs, Lateral);
DEFINE_CONVERSION(autoware_control_msgs, Longitudinal);
Expand All @@ -190,8 +190,7 @@ auto toMsg(
{
using namespace simulation_api_schema;

auto convert_color = [](auto color) constexpr
{
auto convert_color = [](auto color) constexpr {
switch (color) {
case TrafficLight_Color_RED:
return TrafficLightBulbMessageType::RED;
Expand All @@ -206,8 +205,7 @@ auto toMsg(
}
};

auto convert_shape = [](auto shape) constexpr
{
auto convert_shape = [](auto shape) constexpr {
switch (shape) {
case TrafficLight_Shape_CIRCLE:
return TrafficLightBulbMessageType::CIRCLE;
Expand Down Expand Up @@ -235,8 +233,7 @@ auto toMsg(
}
};

auto convert_status = [](auto status) constexpr
{
auto convert_status = [](auto status) constexpr {
switch (status) {
case TrafficLight_Status_SOLID_OFF:
return TrafficLightBulbMessageType::SOLID_OFF;
Expand Down
14 changes: 7 additions & 7 deletions simulation/traffic_simulator/include/traffic_simulator/behavior/behavior_plugin_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ class BehaviorPluginBase
virtual auto update(const double current_time, const double step_time) -> void = 0;
virtual const std::string & getCurrentAction() const = 0;

#define DEFINE_GETTER_SETTER(NAME, KEY, TYPE) \
virtual TYPE get##NAME() = 0; \
virtual void set##NAME(const TYPE & value) = 0; \
auto get##NAME##Key() const->const std::string & \
{ \
static const std::string key = KEY; \
return key; \
#define DEFINE_GETTER_SETTER(NAME, KEY, TYPE) \
virtual TYPE get##NAME() = 0; \
virtual void set##NAME(const TYPE & value) = 0; \
auto get##NAME##Key() const -> const std::string & \
{ \
static const std::string key = KEY; \
return key; \
}

// clang-format off
Expand Down
Loading