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

Fixes for uncrustify 0.72 #1844

Merged
merged 1 commit into from
Dec 17, 2021
Merged

Fixes for uncrustify 0.72 #1844

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
4 changes: 2 additions & 2 deletions rclcpp/include/rclcpp/function_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ template<typename ClassT, typename ReturnTypeT, typename ... Args, typename ...
#if defined _LIBCPP_VERSION // libc++ (Clang)
struct function_traits<std::__bind<ReturnTypeT (ClassT::*)(Args ...), FArgs ...>>
#elif defined _GLIBCXX_RELEASE // glibc++ (GNU C++ >= 7.1)
struct function_traits<std::_Bind<ReturnTypeT(ClassT::*(FArgs ...))(Args ...)>>
struct function_traits<std::_Bind<ReturnTypeT(ClassT::* (FArgs ...))(Args ...)>>
#elif defined __GLIBCXX__ // glibc++ (GNU C++)
struct function_traits<std::_Bind<std::_Mem_fn<ReturnTypeT (ClassT::*)(Args ...)>(FArgs ...)>>
#elif defined _MSC_VER // MS Visual Studio
Expand All @@ -100,7 +100,7 @@ template<typename ClassT, typename ReturnTypeT, typename ... Args, typename ...
#if defined _LIBCPP_VERSION // libc++ (Clang)
struct function_traits<std::__bind<ReturnTypeT (ClassT::*)(Args ...) const, FArgs ...>>
#elif defined _GLIBCXX_RELEASE // glibc++ (GNU C++ >= 7.1)
struct function_traits<std::_Bind<ReturnTypeT(ClassT::*(FArgs ...))(Args ...) const>>
struct function_traits<std::_Bind<ReturnTypeT(ClassT::* (FArgs ...))(Args ...) const>>
#elif defined __GLIBCXX__ // glibc++ (GNU C++)
struct function_traits<std::_Bind<std::_Mem_fn<ReturnTypeT (ClassT::*)(Args ...) const>(FArgs ...)>>
#elif defined _MSC_VER // MS Visual Studio
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/wait_set_policies/sequential_synchronization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class SequentialSynchronization : public detail::SynchronizationPolicyCommon
std::shared_ptr<rclcpp::Waitable> && waitable,
std::shared_ptr<void> && associated_entity,
std::function<
void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void>&&)
void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void> &&)
> add_waitable_function)
{
// Explicitly no thread synchronization.
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/wait_set_policies/thread_safe_synchronization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class ThreadSafeSynchronization : public detail::SynchronizationPolicyCommon
std::shared_ptr<rclcpp::Waitable> && waitable,
std::shared_ptr<void> && associated_entity,
std::function<
void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void>&&)
void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void> &&)
> add_waitable_function)
{
using rclcpp::wait_set_policies::detail::WritePreferringReadWriteLock;
Expand Down
4 changes: 2 additions & 2 deletions rclcpp/test/utils/rclcpp_gtest_macros.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ ::testing::AssertionResult AreThrowableContentsEqual(
#define RCLCPP_EXPECT_THROW_EQ(throwing_statement, expected_exception) \
do { \
::testing::AssertionResult \
is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
::testing::AssertionSuccess(); \
CHECK_THROW_EQ_IMPL( \
throwing_statement, \
Expand All @@ -183,7 +183,7 @@ ::testing::AssertionResult AreThrowableContentsEqual(
#define RCLCPP_ASSERT_THROW_EQ(throwing_statement, expected_exception) \
do { \
::testing::AssertionResult \
is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
::testing::AssertionSuccess(); \
CHECK_THROW_EQ_IMPL( \
throwing_statement, \
Expand Down
2 changes: 1 addition & 1 deletion rclcpp_action/src/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ClientBaseImpl
: node_graph_(node_graph),
node_handle(node_base->get_shared_rcl_node_handle()),
logger(node_logging->get_logger().get_child("rclcpp_action")),
random_bytes_generator(std::random_device{} ())
random_bytes_generator(std::random_device{}())
{
std::weak_ptr<rcl_node_t> weak_node_handle(node_handle);
client_handle = std::shared_ptr<rcl_action_client_t>(
Expand Down