Skip to content

Commit 7483e2d

Browse files
Properly include visibility headers in protobuf files
1 parent 7bc7dc2 commit 7483e2d

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

rosidl_adapter_proto/cmake/rosidl_adapter_proto-extras.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ else()
4949
endif()
5050
endforeach()
5151

52-
endif()
52+
endif()

rosidl_typesupport_protobuf/rosidl_typesupport_protobuf/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def ros_message_functions_header_c(package_name, interface_path):
6767
return f"{include_base}__functions.h"
6868

6969
def ros_message_functions_header_c_from_namespace(namespace, name):
70-
include_parts = namespace;
70+
include_parts = list(namespace)
7171
if CURRENT_DISTRO >= DISTROS["foxy"]:
7272
include_parts += ["detail"]
7373
include_parts += [convert_camel_case_to_lower_case_underscore(name)]

rosidl_typesupport_protobuf_c/rosidl_typesupport_protobuf_c/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# ================================= Apache 2.0 =================================
2-
#
3-
# Copyright (C) 2021 Continental
1+
# Copyright 2016-2018 Open Source Robotics Foundation, Inc.
42
#
53
# Licensed under the Apache License, Version 2.0 (the "License");
64
# you may not use this file except in compliance with the License.
@@ -13,8 +11,6 @@
1311
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1412
# See the License for the specific language governing permissions and
1513
# limitations under the License.
16-
#
17-
# ================================= Apache 2.0 =================================
1814

1915
from rosidl_cmake import generate_files
2016

rosidl_typesupport_protobuf_cpp/resource/msg__type_support.cpp.em

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ from rosidl_typesupport_protobuf import *
2525

2626
ros_type_ns = ros_type_namespace(package_name, interface_path)
2727
ros_type_name = ros_type_name(message)
28-
ros_type = ros_type(package_name=package_name, interface_path=interface_path, message=message)
29-
proto_type = protobuf_type(package_name=package_name, interface_path=interface_path, message=message)
28+
ros_type = ros_type(package_name, interface_path, message)
29+
proto_type = protobuf_type(package_name, interface_path, message)
3030

3131
system_header_files = [
3232
'string',

0 commit comments

Comments
 (0)