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

Rename message_bounds to include typesupport #475

Merged
merged 1 commit into from
Apr 24, 2020
+24 −24
Merged

Rename message_bounds to include typesupport #475

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
2 changes: 1 addition & 1 deletion rosidl_runtime_c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ find_package(ament_cmake_ros REQUIRED)
find_package(rosidl_typesupport_interface REQUIRED)

add_library(${PROJECT_NAME}
"src/message_bounds.c"
"src/message_type_support.c"
"src/primitives_sequence_functions.c"
"src/sequence_bound.c"
"src/service_type_support.c"
"src/string_functions.c"
"src/u16string_functions.c"
Expand Down
26 changes: 13 additions & 13 deletions .../rosidl_runtime_c/message_bounds_struct.h → ...include/rosidl_runtime_c/sequence_bound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef ROSIDL_RUNTIME_C__MESSAGE_BOUNDS_STRUCT_H_
#define ROSIDL_RUNTIME_C__MESSAGE_BOUNDS_STRUCT_H_
#ifndef ROSIDL_RUNTIME_C__SEQUENCE_BOUND_H_
#define ROSIDL_RUNTIME_C__SEQUENCE_BOUND_H_

#include "rosidl_runtime_c/visibility_control.h"
#include "rosidl_typesupport_interface/macros.h"
Expand All @@ -23,32 +23,32 @@ extern "C"
{
#endif

typedef struct rosidl_message_bounds_t rosidl_message_bounds_t;
typedef struct rosidl_runtime_c__Sequence__bound rosidl_runtime_c__Sequence__bound;

typedef const rosidl_message_bounds_t * (* rosidl_message_bounds_handle_function)(
const rosidl_message_bounds_t *, const char *);
typedef const rosidl_runtime_c__Sequence__bound * (* rosidl_runtime_c__bound_handle_function)(
const rosidl_runtime_c__Sequence__bound *, const char *);

struct rosidl_message_bounds_t
struct rosidl_runtime_c__Sequence__bound
{
const char * typesupport_identifier;
const void * data;
rosidl_message_bounds_handle_function func;
rosidl_runtime_c__bound_handle_function func;
};

ROSIDL_GENERATOR_C_PUBLIC
const rosidl_message_bounds_t * get_message_bounds_handle(
const rosidl_message_bounds_t * handle, const char * identifier);
const rosidl_runtime_c__Sequence__bound * get_sequence_bound_handle(
const rosidl_runtime_c__Sequence__bound * handle, const char * identifier);

ROSIDL_GENERATOR_C_PUBLIC
const rosidl_message_bounds_t * get_message_bounds_handle_function(
const rosidl_message_bounds_t * handle, const char * identifier);
const rosidl_runtime_c__Sequence__bound * get_sequence_bound_handle_function(
const rosidl_runtime_c__Sequence__bound * handle, const char * identifier);

#define ROSIDL_GET_MSG_BOUNDS(PkgName, MsgSubfolder, MsgName) \
#define ROSIDL_GET_SEQUENCE_BOUNDS(PkgName, MsgSubfolder, MsgName) \
ROSIDL_BOUNDS_INTERFACE__MESSAGE_SYMBOL_NAME( \
rosidl_typesupport_c, PkgName, MsgSubfolder, MsgName)()

#ifdef __cplusplus
}
#endif

#endif // ROSIDL_RUNTIME_C__MESSAGE_BOUNDS_STRUCT_H_
#endif // ROSIDL_RUNTIME_C__SEQUENCE_BOUND_H_
6 changes: 3 additions & 3 deletions rosidl_runtime_c/include/rosidl_runtime_c/string_bound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef ROSIDL_RUNTIME_C__STRING_BOUNDS_H_
#define ROSIDL_RUNTIME_C__STRING_BOUNDS_H_
#ifndef ROSIDL_RUNTIME_C__STRING_BOUND_H_
#define ROSIDL_RUNTIME_C__STRING_BOUND_H_

#include <stddef.h>

Expand All @@ -24,4 +24,4 @@ typedef struct rosidl_runtime_c__String__bound
size_t bound;
} rosidl_runtime_c__String__bound;

#endif // ROSIDL_RUNTIME_C__STRING_BOUNDS_H_
#endif // ROSIDL_RUNTIME_C__STRING_BOUND_H_
14 changes: 7 additions & 7 deletions rosidl_runtime_c/src/message_bounds.c → rosidl_runtime_c/src/sequence_bound.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "rosidl_runtime_c/message_bounds_struct.h"
#include "rosidl_runtime_c/sequence_bound.h"

#include <assert.h>
#include <string.h>

const rosidl_message_bounds_t * get_message_bounds_handle(
const rosidl_message_bounds_t * handle, const char * identifier)
const rosidl_runtime_c__Sequence__bound * get_sequence_bound_handle(
const rosidl_runtime_c__Sequence__bound * handle, const char * identifier)
{
assert(handle);
assert(handle->func);
rosidl_message_bounds_handle_function func =
(rosidl_message_bounds_handle_function)(handle->func);
rosidl_runtime_c__bound_handle_function func =
(rosidl_runtime_c__bound_handle_function)(handle->func);
return func(handle, identifier);
}

const rosidl_message_bounds_t * get_message_bound_handle_function(
const rosidl_message_bounds_t * handle, const char * identifier)
const rosidl_runtime_c__Sequence__bound * get_sequence_bound_handle_function(
const rosidl_runtime_c__Sequence__bound * handle, const char * identifier)
{
assert(handle);
assert(handle->typesupport_identifier);
Expand Down