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

move qos_profile_rosout_default to rmw. #1195

Open
wants to merge 3 commits into
base: rolling
Choose a base branch
from
Open

move qos_profile_rosout_default to rmw. #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5071ee
move qos_profile_rosout_default to rmw.
fujitatomoya Nov 6, 2024
f9ef0ba
keep rcl_qos_profile_rosout_default with deprecation warning.
fujitatomoya Jan 22, 2025
cf86132
make windows happy.
fujitatomoya Jan 22, 2025
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: 4 additions & 0 deletions rcl/include/rcl/logging_rosout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
#include "rcl/allocator.h"
#include "rcl/error_handling.h"
#include "rcl/node.h"
#include "rcl/macros.h"
#include "rcl/types.h"
#include "rcl/visibility_control.h"

#include "rmw/qos_profiles.h"

#ifdef __cplusplus
extern "C"
{
Expand All @@ -34,6 +37,7 @@ extern "C"
* - durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL
* - lifespan = {10, 0}
*/
RCUTILS_DEPRECATED_WITH_MSG("use rmw_qos_profile_rosout_default instead")
static const rmw_qos_profile_t rcl_qos_profile_rosout_default =
fujitatomoya marked this conversation as resolved.
Show resolved Hide resolved
{
RMW_QOS_POLICY_HISTORY_KEEP_LAST,
Expand Down
4 changes: 3 additions & 1 deletion rcl/src/rcl/node_options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ extern "C"
#include "rcl/error_handling.h"
#include "rcl/logging_rosout.h"

#include "rmw/qos_profiles.h"

rcl_node_options_t
rcl_node_get_default_options(void)
{
Expand All @@ -35,7 +37,7 @@ rcl_node_get_default_options(void)
.use_global_arguments = true,
.arguments = rcl_get_zero_initialized_arguments(),
.enable_rosout = true,
.rosout_qos = rcl_qos_profile_rosout_default,
.rosout_qos = rmw_qos_profile_rosout_default,
};
return default_options;
}
Expand Down
2 changes: 1 addition & 1 deletion rcl/test/rcl/test_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ TEST_F(TestNodeFixture, test_rcl_node_options) {

EXPECT_TRUE(default_options.use_global_arguments);
EXPECT_TRUE(default_options.enable_rosout);
EXPECT_EQ(rcl_qos_profile_rosout_default, default_options.rosout_qos);
EXPECT_EQ(rmw_qos_profile_rosout_default, default_options.rosout_qos);
EXPECT_TRUE(rcutils_allocator_is_valid(&(default_options.allocator)));

EXPECT_EQ(RCL_RET_INVALID_ARGUMENT, rcl_node_options_copy(nullptr, &default_options));
Expand Down