From 4ec3959b72e0f87874c320887b59bd9f3e1556b4 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Sat, 2 Nov 2024 13:30:38 +0000 Subject: [PATCH] Drop support for long double/float128. Signed-off-by: Chris Lalancette --- .../rosidl_generator_c/__init__.py | 1 - .../rosidl_generator_cpp/__init__.py | 3 +-- .../test/rosidl_generator_cpp/test_traits.cpp | 3 --- .../__init__.py | 5 ---- rosidl_parser/rosidl_parser/definition.py | 3 +-- rosidl_parser/rosidl_parser/grammar.lark | 2 -- rosidl_parser/rosidl_parser/parser.py | 1 - rosidl_parser/test/msg/MyMessage.idl | 1 - .../rosidl_runtime_c/primitives_sequence.h | 1 - .../primitives_sequence_functions.h | 1 - .../type_description/field_type__struct.h | 24 ------------------- .../src/primitives_sequence_functions.c | 1 - .../field_type__description.c | 4 ---- .../test_primitives_sequence_functions.cpp | 1 - .../include/rosidl_runtime_cpp/traits.hpp | 7 ------ .../type_description/field_type__struct.hpp | 16 ------------- .../field_types.h | 2 -- .../field_types.hpp | 2 -- .../helpers.hpp | 1 - .../types.hpp | 1 - 20 files changed, 2 insertions(+), 78 deletions(-) diff --git a/rosidl_generator_c/rosidl_generator_c/__init__.py b/rosidl_generator_c/rosidl_generator_c/__init__.py index 4e4bf76d9..f456027e6 100644 --- a/rosidl_generator_c/rosidl_generator_c/__init__.py +++ b/rosidl_generator_c/rosidl_generator_c/__init__.py @@ -62,7 +62,6 @@ def prefix_with_bom_if_necessary(content: str) -> str: BASIC_IDL_TYPES_TO_C = { 'float': 'float', 'double': 'double', - 'long double': 'long double', 'char': 'signed char', 'wchar': 'uint16_t', 'boolean': 'bool', diff --git a/rosidl_generator_cpp/rosidl_generator_cpp/__init__.py b/rosidl_generator_cpp/rosidl_generator_cpp/__init__.py index 85db597c7..4e01a3b1d 100644 --- a/rosidl_generator_cpp/rosidl_generator_cpp/__init__.py +++ b/rosidl_generator_cpp/rosidl_generator_cpp/__init__.py @@ -60,7 +60,6 @@ def prefix_with_bom_if_necessary(content: str) -> str: 'wchar': 'char16_t', 'float': 'float', 'double': 'double', - 'long double': 'long double', 'uint8': 'uint8_t', 'int8': 'int8_t', 'uint16': 'uint16_t', @@ -199,7 +198,7 @@ def primitive_value_to_cpp(type_, value): if type_.typename in [ 'short', 'unsigned short', 'char', 'wchar', - 'double', 'long double', + 'double', 'octet', 'int8', 'uint8', 'int16', 'uint16', diff --git a/rosidl_generator_tests/test/rosidl_generator_cpp/test_traits.cpp b/rosidl_generator_tests/test/rosidl_generator_cpp/test_traits.cpp index 7e16d450c..1ac16cb18 100644 --- a/rosidl_generator_tests/test/rosidl_generator_cpp/test_traits.cpp +++ b/rosidl_generator_tests/test/rosidl_generator_cpp/test_traits.cpp @@ -105,10 +105,8 @@ unbounded_sequence_of_wstrings: [] /*{ test_msgs::idl::IdlOnlyTypes msg; msg.wchar_value = u'ö'; - msg.long_double_value = 1.125; EXPECT_STREQ( R"(wchar_value: "\u00f6" -long_double_value: 1.12500 )", to_yaml( msg).c_str()); @@ -116,7 +114,6 @@ long_double_value: 1.12500 msg.wchar_value = u'貓'; EXPECT_STREQ( R"(wchar_value: "\u8c93" -long_double_value: 1.12500 )", to_yaml( msg).c_str()); diff --git a/rosidl_generator_type_description/rosidl_generator_type_description/__init__.py b/rosidl_generator_type_description/rosidl_generator_type_description/__init__.py index c62df1787..29e27cbc8 100644 --- a/rosidl_generator_type_description/rosidl_generator_type_description/__init__.py +++ b/rosidl_generator_type_description/rosidl_generator_type_description/__init__.py @@ -233,7 +233,6 @@ def parse_rihs_string(rihs_str: str) -> Tuple[int, str]: 'uint64': 'FIELD_TYPE_UINT64', 'float': 'FIELD_TYPE_FLOAT', 'double': 'FIELD_TYPE_DOUBLE', - 'long': 'LONG_DOUBLE', 'char': 'FIELD_TYPE_CHAR', 'wchar': 'FIELD_TYPE_WCHAR', 'boolean': 'FIELD_TYPE_BOOLEAN', @@ -272,7 +271,6 @@ def parse_rihs_string(rihs_str: str) -> Tuple[int, str]: # Floating-Point Types 'FIELD_TYPE_FLOAT': 10, 'FIELD_TYPE_DOUBLE': 11, - 'FIELD_TYPE_LONG_DOUBLE': 12, # Char and WChar Types 'FIELD_TYPE_CHAR': 13, @@ -308,7 +306,6 @@ def parse_rihs_string(rihs_str: str) -> Tuple[int, str]: 'FIELD_TYPE_UINT64_ARRAY': 57, 'FIELD_TYPE_FLOAT_ARRAY': 58, 'FIELD_TYPE_DOUBLE_ARRAY': 59, - 'FIELD_TYPE_LONG_DOUBLE_ARRAY': 60, 'FIELD_TYPE_CHAR_ARRAY': 61, 'FIELD_TYPE_WCHAR_ARRAY': 62, 'FIELD_TYPE_BOOLEAN_ARRAY': 63, @@ -332,7 +329,6 @@ def parse_rihs_string(rihs_str: str) -> Tuple[int, str]: 'FIELD_TYPE_UINT64_BOUNDED_SEQUENCE': 105, 'FIELD_TYPE_FLOAT_BOUNDED_SEQUENCE': 106, 'FIELD_TYPE_DOUBLE_BOUNDED_SEQUENCE': 107, - 'FIELD_TYPE_LONG_DOUBLE_BOUNDED_SEQUENCE': 108, 'FIELD_TYPE_CHAR_BOUNDED_SEQUENCE': 109, 'FIELD_TYPE_WCHAR_BOUNDED_SEQUENCE': 110, 'FIELD_TYPE_BOOLEAN_BOUNDED_SEQUENCE': 111, @@ -356,7 +352,6 @@ def parse_rihs_string(rihs_str: str) -> Tuple[int, str]: 'FIELD_TYPE_UINT64_UNBOUNDED_SEQUENCE': 153, 'FIELD_TYPE_FLOAT_UNBOUNDED_SEQUENCE': 154, 'FIELD_TYPE_DOUBLE_UNBOUNDED_SEQUENCE': 155, - 'FIELD_TYPE_LONG_DOUBLE_UNBOUNDED_SEQUENCE': 156, 'FIELD_TYPE_CHAR_UNBOUNDED_SEQUENCE': 157, 'FIELD_TYPE_WCHAR_UNBOUNDED_SEQUENCE': 158, 'FIELD_TYPE_BOOLEAN_UNBOUNDED_SEQUENCE': 159, diff --git a/rosidl_parser/rosidl_parser/definition.py b/rosidl_parser/rosidl_parser/definition.py index 5873ba470..a10426ad1 100644 --- a/rosidl_parser/rosidl_parser/definition.py +++ b/rosidl_parser/rosidl_parser/definition.py @@ -46,7 +46,6 @@ FLOATING_POINT_TYPES: Final = ( # rule (24) 'float', 'double', - 'long double', ) CHARACTER_TYPES: Final = ( 'char', # rule (34) @@ -104,7 +103,7 @@ NonexplicitIntegerTypeValues = Union[SignedNonexplicitIntegerTypeValues, UnsignedNonexplicitIntegerTypeValues] - FloatingPointTypeValues = Literal['float', 'double', 'long double'] + FloatingPointTypeValues = Literal['float', 'double'] CharacterTypeValues = Literal['char', 'wchar'] BooleanValue = Literal['boolean'] OctetValue = Literal['octet'] diff --git a/rosidl_parser/rosidl_parser/grammar.lark b/rosidl_parser/rosidl_parser/grammar.lark index bb7f7890f..d6f3b074d 100644 --- a/rosidl_parser/rosidl_parser/grammar.lark +++ b/rosidl_parser/rosidl_parser/grammar.lark @@ -226,11 +226,9 @@ base_type_spec.2: integer_type // (24) floating_pt_type.2: floating_pt_type_float | floating_pt_type_double - | floating_pt_type_long_double // separate rules to identify the floating point type floating_pt_type_float: "float" floating_pt_type_double: "double" -floating_pt_type_long_double: "long" "double" // (25) integer_type.2: signed_int diff --git a/rosidl_parser/rosidl_parser/parser.py b/rosidl_parser/rosidl_parser/parser.py index 399ceee5d..21c664587 100644 --- a/rosidl_parser/rosidl_parser/parser.py +++ b/rosidl_parser/rosidl_parser/parser.py @@ -451,7 +451,6 @@ def add_message_members(msg: Message, tree: 'ParseTree') -> None: BASE_TYPE_SPEC_TO_IDL_TYPE: Dict[str, 'BasicTypeValues'] = { 'floating_pt_type_float': 'float', 'floating_pt_type_double': 'double', - 'floating_pt_type_long_double': 'long double', 'char_type': 'char', 'wide_char_type': 'wchar', 'boolean_type': 'boolean', diff --git a/rosidl_parser/test/msg/MyMessage.idl b/rosidl_parser/test/msg/MyMessage.idl index f2d3cfa61..c03a89a57 100644 --- a/rosidl_parser/test/msg/MyMessage.idl +++ b/rosidl_parser/test/msg/MyMessage.idl @@ -28,7 +28,6 @@ module rosidl_parser { unsigned long long unsigned_long_long_value; float float_value; double double_value; - long double long_double_value; char char_value; wchar wchar_value; boolean boolean_value; diff --git a/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence.h b/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence.h index 5c152a3c6..d7bc3ddc6 100644 --- a/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence.h +++ b/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence.h @@ -30,7 +30,6 @@ // sequence types for all basic types ROSIDL_RUNTIME_C__PRIMITIVE_SEQUENCE(float, float) ROSIDL_RUNTIME_C__PRIMITIVE_SEQUENCE(double, double) -ROSIDL_RUNTIME_C__PRIMITIVE_SEQUENCE(long_double, long double) ROSIDL_RUNTIME_C__PRIMITIVE_SEQUENCE(char, signed char) ROSIDL_RUNTIME_C__PRIMITIVE_SEQUENCE(wchar, uint16_t) ROSIDL_RUNTIME_C__PRIMITIVE_SEQUENCE(boolean, bool) diff --git a/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence_functions.h b/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence_functions.h index 4f8b1feaf..9a66df8d3 100644 --- a/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence_functions.h +++ b/rosidl_runtime_c/include/rosidl_runtime_c/primitives_sequence_functions.h @@ -113,7 +113,6 @@ extern "C" /**@{*/ ROSIDL_RUNTIME_C__DECLARE_PRIMITIVE_SEQUENCE_FUNCTIONS(float) ROSIDL_RUNTIME_C__DECLARE_PRIMITIVE_SEQUENCE_FUNCTIONS(double) -ROSIDL_RUNTIME_C__DECLARE_PRIMITIVE_SEQUENCE_FUNCTIONS(long_double) ROSIDL_RUNTIME_C__DECLARE_PRIMITIVE_SEQUENCE_FUNCTIONS(char) ROSIDL_RUNTIME_C__DECLARE_PRIMITIVE_SEQUENCE_FUNCTIONS(wchar) ROSIDL_RUNTIME_C__DECLARE_PRIMITIVE_SEQUENCE_FUNCTIONS(boolean) diff --git a/rosidl_runtime_c/include/rosidl_runtime_c/type_description/field_type__struct.h b/rosidl_runtime_c/include/rosidl_runtime_c/type_description/field_type__struct.h index 012340fb4..1fc5b05b6 100644 --- a/rosidl_runtime_c/include/rosidl_runtime_c/type_description/field_type__struct.h +++ b/rosidl_runtime_c/include/rosidl_runtime_c/type_description/field_type__struct.h @@ -114,12 +114,6 @@ enum rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_DOUBLE = 11 }; -/// Constant 'FIELD_TYPE_LONG_DOUBLE'. -enum -{ - rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_LONG_DOUBLE = 12 -}; - /// Constant 'FIELD_TYPE_CHAR'. /** * Char and WChar Types @@ -267,12 +261,6 @@ enum rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_DOUBLE_ARRAY = 59 }; -/// Constant 'FIELD_TYPE_LONG_DOUBLE_ARRAY'. -enum -{ - rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_LONG_DOUBLE_ARRAY = 60 -}; - /// Constant 'FIELD_TYPE_CHAR_ARRAY'. enum { @@ -402,12 +390,6 @@ enum rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_DOUBLE_BOUNDED_SEQUENCE = 107 }; -/// Constant 'FIELD_TYPE_LONG_DOUBLE_BOUNDED_SEQUENCE'. -enum -{ - rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_LONG_DOUBLE_BOUNDED_SEQUENCE = 108 -}; - /// Constant 'FIELD_TYPE_CHAR_BOUNDED_SEQUENCE'. enum { @@ -537,12 +519,6 @@ enum rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_DOUBLE_UNBOUNDED_SEQUENCE = 155 }; -/// Constant 'FIELD_TYPE_LONG_DOUBLE_UNBOUNDED_SEQUENCE'. -enum -{ - rosidl_runtime_c__type_description__FieldType__FIELD_TYPE_LONG_DOUBLE_UNBOUNDED_SEQUENCE = 156 -}; - /// Constant 'FIELD_TYPE_CHAR_UNBOUNDED_SEQUENCE'. enum { diff --git a/rosidl_runtime_c/src/primitives_sequence_functions.c b/rosidl_runtime_c/src/primitives_sequence_functions.c index c1ef0f0cc..7204b69f5 100644 --- a/rosidl_runtime_c/src/primitives_sequence_functions.c +++ b/rosidl_runtime_c/src/primitives_sequence_functions.c @@ -107,7 +107,6 @@ // array functions for all basic types ROSIDL_GENERATOR_C__DEFINE_PRIMITIVE_SEQUENCE_FUNCTIONS(float, float) ROSIDL_GENERATOR_C__DEFINE_PRIMITIVE_SEQUENCE_FUNCTIONS(double, double) -ROSIDL_GENERATOR_C__DEFINE_PRIMITIVE_SEQUENCE_FUNCTIONS(long_double, long double) ROSIDL_GENERATOR_C__DEFINE_PRIMITIVE_SEQUENCE_FUNCTIONS(char, signed char) ROSIDL_GENERATOR_C__DEFINE_PRIMITIVE_SEQUENCE_FUNCTIONS(wchar, uint16_t) ROSIDL_GENERATOR_C__DEFINE_PRIMITIVE_SEQUENCE_FUNCTIONS(boolean, bool) diff --git a/rosidl_runtime_c/src/type_description/field_type__description.c b/rosidl_runtime_c/src/type_description/field_type__description.c index 828a95bf1..a2a5e3b6c 100644 --- a/rosidl_runtime_c/src/type_description/field_type__description.c +++ b/rosidl_runtime_c/src/type_description/field_type__description.c @@ -137,7 +137,6 @@ static char toplevel_type_raw_source[] = "# Floating-Point Types\n" "uint8 FIELD_TYPE_FLOAT = 10\n" "uint8 FIELD_TYPE_DOUBLE = 11\n" - "uint8 FIELD_TYPE_LONG_DOUBLE = 12\n" "\n" "# Char and WChar Types\n" "uint8 FIELD_TYPE_CHAR = 13\n" @@ -173,7 +172,6 @@ static char toplevel_type_raw_source[] = "uint8 FIELD_TYPE_UINT64_ARRAY = 57\n" "uint8 FIELD_TYPE_FLOAT_ARRAY = 58\n" "uint8 FIELD_TYPE_DOUBLE_ARRAY = 59\n" - "uint8 FIELD_TYPE_LONG_DOUBLE_ARRAY = 60\n" "uint8 FIELD_TYPE_CHAR_ARRAY = 61\n" "uint8 FIELD_TYPE_WCHAR_ARRAY = 62\n" "uint8 FIELD_TYPE_BOOLEAN_ARRAY = 63\n" @@ -197,7 +195,6 @@ static char toplevel_type_raw_source[] = "uint8 FIELD_TYPE_UINT64_BOUNDED_SEQUENCE = 105\n" "uint8 FIELD_TYPE_FLOAT_BOUNDED_SEQUENCE = 106\n" "uint8 FIELD_TYPE_DOUBLE_BOUNDED_SEQUENCE = 107\n" - "uint8 FIELD_TYPE_LONG_DOUBLE_BOUNDED_SEQUENCE = 108\n" "uint8 FIELD_TYPE_CHAR_BOUNDED_SEQUENCE = 109\n" "uint8 FIELD_TYPE_WCHAR_BOUNDED_SEQUENCE = 110\n" "uint8 FIELD_TYPE_BOOLEAN_BOUNDED_SEQUENCE = 111\n" @@ -221,7 +218,6 @@ static char toplevel_type_raw_source[] = "uint8 FIELD_TYPE_UINT64_UNBOUNDED_SEQUENCE = 153\n" "uint8 FIELD_TYPE_FLOAT_UNBOUNDED_SEQUENCE = 154\n" "uint8 FIELD_TYPE_DOUBLE_UNBOUNDED_SEQUENCE = 155\n" - "uint8 FIELD_TYPE_LONG_DOUBLE_UNBOUNDED_SEQUENCE = 156\n" "uint8 FIELD_TYPE_CHAR_UNBOUNDED_SEQUENCE = 157\n" "uint8 FIELD_TYPE_WCHAR_UNBOUNDED_SEQUENCE = 158\n" "uint8 FIELD_TYPE_BOOLEAN_UNBOUNDED_SEQUENCE = 159\n" diff --git a/rosidl_runtime_c/test/test_primitives_sequence_functions.cpp b/rosidl_runtime_c/test/test_primitives_sequence_functions.cpp index 93c916a2d..5cc55b060 100644 --- a/rosidl_runtime_c/test/test_primitives_sequence_functions.cpp +++ b/rosidl_runtime_c/test/test_primitives_sequence_functions.cpp @@ -102,7 +102,6 @@ TEST_PRIMITIVE_SEQUENCE_FUNCTIONS(float, float) TEST_PRIMITIVE_SEQUENCE_FUNCTIONS(double, double) -TEST_PRIMITIVE_SEQUENCE_FUNCTIONS(long_double, long double) TEST_PRIMITIVE_SEQUENCE_FUNCTIONS(char, signed char) TEST_PRIMITIVE_SEQUENCE_FUNCTIONS(wchar, uint16_t) TEST_PRIMITIVE_SEQUENCE_FUNCTIONS(boolean, bool) diff --git a/rosidl_runtime_cpp/include/rosidl_runtime_cpp/traits.hpp b/rosidl_runtime_cpp/include/rosidl_runtime_cpp/traits.hpp index 2d285b7b2..9977f5409 100644 --- a/rosidl_runtime_cpp/include/rosidl_runtime_cpp/traits.hpp +++ b/rosidl_runtime_cpp/include/rosidl_runtime_cpp/traits.hpp @@ -59,13 +59,6 @@ inline void value_to_yaml(double value, std::ostream & out) out.flags(flags); } -inline void value_to_yaml(long double value, std::ostream & out) -{ - auto flags = out.flags(); - out << std::showpoint << value; - out.flags(flags); -} - inline void value_to_yaml(uint8_t value, std::ostream & out) { out << +value; diff --git a/rosidl_runtime_cpp/include/rosidl_runtime_cpp/type_description/field_type__struct.hpp b/rosidl_runtime_cpp/include/rosidl_runtime_cpp/type_description/field_type__struct.hpp index 63cb2a55c..62c0f24e1 100644 --- a/rosidl_runtime_cpp/include/rosidl_runtime_cpp/type_description/field_type__struct.hpp +++ b/rosidl_runtime_cpp/include/rosidl_runtime_cpp/type_description/field_type__struct.hpp @@ -142,8 +142,6 @@ struct FieldType_ 10u; static constexpr uint8_t FIELD_TYPE_DOUBLE = 11u; - static constexpr uint8_t FIELD_TYPE_LONG_DOUBLE = - 12u; static constexpr uint8_t FIELD_TYPE_CHAR = 13u; static constexpr uint8_t FIELD_TYPE_WCHAR = @@ -186,8 +184,6 @@ struct FieldType_ 58u; static constexpr uint8_t FIELD_TYPE_DOUBLE_ARRAY = 59u; - static constexpr uint8_t FIELD_TYPE_LONG_DOUBLE_ARRAY = - 60u; static constexpr uint8_t FIELD_TYPE_CHAR_ARRAY = 61u; static constexpr uint8_t FIELD_TYPE_WCHAR_ARRAY = @@ -230,8 +226,6 @@ struct FieldType_ 106u; static constexpr uint8_t FIELD_TYPE_DOUBLE_BOUNDED_SEQUENCE = 107u; - static constexpr uint8_t FIELD_TYPE_LONG_DOUBLE_BOUNDED_SEQUENCE = - 108u; static constexpr uint8_t FIELD_TYPE_CHAR_BOUNDED_SEQUENCE = 109u; static constexpr uint8_t FIELD_TYPE_WCHAR_BOUNDED_SEQUENCE = @@ -274,8 +268,6 @@ struct FieldType_ 154u; static constexpr uint8_t FIELD_TYPE_DOUBLE_UNBOUNDED_SEQUENCE = 155u; - static constexpr uint8_t FIELD_TYPE_LONG_DOUBLE_UNBOUNDED_SEQUENCE = - 156u; static constexpr uint8_t FIELD_TYPE_CHAR_UNBOUNDED_SEQUENCE = 157u; static constexpr uint8_t FIELD_TYPE_WCHAR_UNBOUNDED_SEQUENCE = @@ -387,8 +379,6 @@ constexpr uint8_t FieldType_::FIELD_TYPE_FLOAT; template constexpr uint8_t FieldType_::FIELD_TYPE_DOUBLE; template -constexpr uint8_t FieldType_::FIELD_TYPE_LONG_DOUBLE; -template constexpr uint8_t FieldType_::FIELD_TYPE_CHAR; template constexpr uint8_t FieldType_::FIELD_TYPE_WCHAR; @@ -431,8 +421,6 @@ constexpr uint8_t FieldType_::FIELD_TYPE_FLOAT_ARRAY; template constexpr uint8_t FieldType_::FIELD_TYPE_DOUBLE_ARRAY; template -constexpr uint8_t FieldType_::FIELD_TYPE_LONG_DOUBLE_ARRAY; -template constexpr uint8_t FieldType_::FIELD_TYPE_CHAR_ARRAY; template constexpr uint8_t FieldType_::FIELD_TYPE_WCHAR_ARRAY; @@ -475,8 +463,6 @@ constexpr uint8_t FieldType_::FIELD_TYPE_FLOAT_BOUNDED_SEQUE template constexpr uint8_t FieldType_::FIELD_TYPE_DOUBLE_BOUNDED_SEQUENCE; template -constexpr uint8_t FieldType_::FIELD_TYPE_LONG_DOUBLE_BOUNDED_SEQUENCE; -template constexpr uint8_t FieldType_::FIELD_TYPE_CHAR_BOUNDED_SEQUENCE; template constexpr uint8_t FieldType_::FIELD_TYPE_WCHAR_BOUNDED_SEQUENCE; @@ -519,8 +505,6 @@ constexpr uint8_t FieldType_::FIELD_TYPE_FLOAT_UNBOUNDED_SEQ template constexpr uint8_t FieldType_::FIELD_TYPE_DOUBLE_UNBOUNDED_SEQUENCE; template -constexpr uint8_t FieldType_::FIELD_TYPE_LONG_DOUBLE_UNBOUNDED_SEQUENCE; -template constexpr uint8_t FieldType_::FIELD_TYPE_CHAR_UNBOUNDED_SEQUENCE; template constexpr uint8_t FieldType_::FIELD_TYPE_WCHAR_UNBOUNDED_SEQUENCE; diff --git a/rosidl_typesupport_introspection_c/include/rosidl_typesupport_introspection_c/field_types.h b/rosidl_typesupport_introspection_c/include/rosidl_typesupport_introspection_c/field_types.h index cd336cd3b..0015f374b 100644 --- a/rosidl_typesupport_introspection_c/include/rosidl_typesupport_introspection_c/field_types.h +++ b/rosidl_typesupport_introspection_c/include/rosidl_typesupport_introspection_c/field_types.h @@ -31,8 +31,6 @@ enum rosidl_typesupport_introspection_c_field_types rosidl_typesupport_introspection_c__ROS_TYPE_FLOAT = 1, /// Equivalent to double in C types. rosidl_typesupport_introspection_c__ROS_TYPE_DOUBLE = 2, - /// Equivalent to long double in C types. - rosidl_typesupport_introspection_c__ROS_TYPE_LONG_DOUBLE = 3, /// Equivalent to unsigned char in C types. rosidl_typesupport_introspection_c__ROS_TYPE_CHAR = 4, /// Equivalent to char16_t in C types. diff --git a/rosidl_typesupport_introspection_cpp/include/rosidl_typesupport_introspection_cpp/field_types.hpp b/rosidl_typesupport_introspection_cpp/include/rosidl_typesupport_introspection_cpp/field_types.hpp index dc21f61f2..f85296c1f 100644 --- a/rosidl_typesupport_introspection_cpp/include/rosidl_typesupport_introspection_cpp/field_types.hpp +++ b/rosidl_typesupport_introspection_cpp/include/rosidl_typesupport_introspection_cpp/field_types.hpp @@ -28,8 +28,6 @@ namespace rosidl_typesupport_introspection_cpp const uint8_t ROS_TYPE_FLOAT = rosidl_typesupport_introspection_c__ROS_TYPE_FLOAT; /// Equivalent to double in C++ types. const uint8_t ROS_TYPE_DOUBLE = rosidl_typesupport_introspection_c__ROS_TYPE_DOUBLE; -/// Equivalent to long double in C++ types. -const uint8_t ROS_TYPE_LONG_DOUBLE = rosidl_typesupport_introspection_c__ROS_TYPE_LONG_DOUBLE; /// Equivalent to unsigned char in C++ types. const uint8_t ROS_TYPE_CHAR = rosidl_typesupport_introspection_c__ROS_TYPE_CHAR; /// Equivalent to char16_t in C++ types. diff --git a/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/helpers.hpp b/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/helpers.hpp index 79d3762ed..378e29720 100644 --- a/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/helpers.hpp +++ b/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/helpers.hpp @@ -210,7 +210,6 @@ DEFINE_CXX_API_FOR_C_MESSAGE_MEMBER(rosidl_runtime_c__String) DEFINE_CXX_API_FOR_C_MESSAGE_MEMBER(rosidl_runtime_c__U16String) DEFINE_CXX_API_FOR_C_MESSAGE_SEQUENCE_MEMBER(rosidl_runtime_c__float__Sequence) DEFINE_CXX_API_FOR_C_MESSAGE_SEQUENCE_MEMBER(rosidl_runtime_c__double__Sequence) -DEFINE_CXX_API_FOR_C_MESSAGE_SEQUENCE_MEMBER(rosidl_runtime_c__long_double__Sequence) DEFINE_CXX_API_FOR_C_MESSAGE_SEQUENCE_MEMBER(rosidl_runtime_c__char__Sequence) DEFINE_CXX_API_FOR_C_MESSAGE_SEQUENCE_MEMBER(rosidl_runtime_c__wchar__Sequence) DEFINE_CXX_API_FOR_C_MESSAGE_SEQUENCE_MEMBER(rosidl_runtime_c__boolean__Sequence) diff --git a/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/types.hpp b/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/types.hpp index 7876e08cf..087c5577d 100644 --- a/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/types.hpp +++ b/rosidl_typesupport_introspection_tests/include/rosidl_typesupport_introspection_tests/types.hpp @@ -27,7 +27,6 @@ namespace rosidl_typesupport_introspection_tests // match with their C equivalents. using rosidl_typesupport_introspection_cpp::ROS_TYPE_FLOAT; using rosidl_typesupport_introspection_cpp::ROS_TYPE_DOUBLE; -using rosidl_typesupport_introspection_cpp::ROS_TYPE_LONG_DOUBLE; using rosidl_typesupport_introspection_cpp::ROS_TYPE_CHAR; using rosidl_typesupport_introspection_cpp::ROS_TYPE_WCHAR; using rosidl_typesupport_introspection_cpp::ROS_TYPE_BOOLEAN;