Skip to content

Commit 1243d80

Browse files
committed
Refine stubs
Signed-off-by: methylDragon <[email protected]>
1 parent dfb51cc commit 1243d80

8 files changed

+12
-26
lines changed

rclcpp/include/rclcpp/dynamic_typesupport/dynamic_message.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ namespace rclcpp
3232
namespace dynamic_typesupport
3333
{
3434

35-
class DynamicMessageType;
36-
class DynamicMessageTypeBuilder;
37-
3835
/// Utility wrapper class for rosidl_dynamic_typesupport_dynamic_data_t
3936
/// STUBBED OUT
4037
class DynamicMessage : public std::enable_shared_from_this<DynamicMessage>

rclcpp/include/rclcpp/dynamic_typesupport/dynamic_message_type.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ namespace rclcpp
3030
namespace dynamic_typesupport
3131
{
3232

33-
class DynamicMessage;
34-
class DynamicMessageTypeBuilder;
35-
3633
/// Utility wrapper class for `rosidl_dynamic_typesupport_dynamic_type_t`
3734
/// STUBBED OUT
3835
class DynamicMessageType : public std::enable_shared_from_this<DynamicMessageType>

rclcpp/include/rclcpp/dynamic_typesupport/dynamic_message_type_builder.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ namespace rclcpp
3030
namespace dynamic_typesupport
3131
{
3232

33-
class DynamicMessage;
34-
class DynamicMessageType;
35-
3633
/// Utility wrapper class for `rosidl_dynamic_typesupport_dynamic_type_builder_t *`
3734
/// STUBBED OUT
3835
class DynamicMessageTypeBuilder : public std::enable_shared_from_this<DynamicMessageTypeBuilder>

rclcpp/include/rclcpp/dynamic_typesupport/dynamic_serialization_support.hpp

-9
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@ namespace dynamic_typesupport
3131
{
3232

3333
/// Utility wrapper class for rosidl_dynamic_typesupport_serialization_support_t
34-
/**
35-
* This class:
36-
* - Exposes getter methods for the struct
37-
* - Exposes the underlying serialization support API
38-
*
39-
* Ownership:
40-
* - This class, similarly to the rosidl_dynamic_typesupport_serialization_support_t, must outlive
41-
* all downstream usages of the serialization support.
42-
*/
4334
class DynamicSerializationSupport : public std::enable_shared_from_this<DynamicSerializationSupport>
4435
{
4536
public:

rclcpp/include/rclcpp/generic_subscription.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ class GenericSubscription : public rclcpp::SubscriptionBase
125125

126126

127127
// DYNAMIC TYPE ==================================================================================
128-
// TODO(methylDragon): Reorder later
129128
RCLCPP_PUBLIC
130129
rclcpp::dynamic_typesupport::DynamicMessageType::SharedPtr get_shared_dynamic_message_type()
131130
override;

rclcpp/include/rclcpp/subscription_base.hpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
239239
const rosidl_message_type_support_t &
240240
get_message_type_support_handle() const;
241241

242-
/// DEPRECATED: Check if subscription takes and handles serialized messages
242+
/// Return if the subscription is serialized
243+
/**
244+
* \return `true` if the subscription is serialized, `false` otherwise
245+
*/
243246
RCLCPP_PUBLIC
244247
bool
245248
is_serialized() const;

rclcpp/src/rclcpp/dynamic_typesupport/dynamic_serialization_support.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,19 @@ using rclcpp::dynamic_typesupport::DynamicSerializationSupport;
2828

2929
// CONSTRUCTION ====================================================================================
3030
DynamicSerializationSupport::DynamicSerializationSupport(rcl_allocator_t allocator)
31-
: DynamicSerializationSupport::DynamicSerializationSupport("", allocator) {} // STUBBED
31+
: DynamicSerializationSupport::DynamicSerializationSupport("", allocator)
32+
{
33+
throw std::runtime_error("Unimplemented");
34+
}
3235

3336
DynamicSerializationSupport::DynamicSerializationSupport(
3437
const std::string & /*serialization_library_name*/,
3538
rcl_allocator_t /*allocator*/)
3639
: rosidl_serialization_support_(
3740
rosidl_dynamic_typesupport_get_zero_initialized_serialization_support())
38-
{} // STUBBED
41+
{
42+
throw std::runtime_error("Unimplemented");
43+
}
3944

4045
DynamicSerializationSupport::~DynamicSerializationSupport()
4146
{} // STUBBED

rclcpp/src/rclcpp/subscription_base.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,6 @@ SubscriptionBase::get_message_type_support_handle() const
269269
bool
270270
SubscriptionBase::is_serialized() const
271271
{
272-
RCLCPP_WARN(
273-
rclcpp::get_logger(
274-
"rclcpp"), "is_serialized() is deprecated, use get_subscription_type() instead.");
275272
return subscription_type_ == rclcpp::SubscriptionType::SERIALIZED_MESSAGE;
276273
}
277274

@@ -542,6 +539,6 @@ SubscriptionBase::take_dynamic_message(
542539
rclcpp::dynamic_typesupport::DynamicMessage & /*message_out*/,
543540
rclcpp::MessageInfo & /*message_info_out*/)
544541
{
545-
RCLCPP_WARN(rclcpp::get_logger("rclcpp"), "take_dynamic_message stubbed out for now.");
542+
throw std::runtime_error("Unimplemented");
546543
return false;
547544
}

0 commit comments

Comments
 (0)