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

Jump to bottom

Fix up two different C problems. #129

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Fix up two different C problems. #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7952cbc
Fix up two different C problems.
clalancette Aug 2, 2024
06abd59
Fix linting.
clalancette Aug 2, 2024
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 tracetools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ set(SOURCES
set(HEADERS
include/${PROJECT_NAME}/tracetools.h
include/${PROJECT_NAME}/utils.hpp
include/${PROJECT_NAME}/visibility_control.hpp
include/${PROJECT_NAME}/visibility_control.h
)
if(NOT TRACETOOLS_TRACEPOINTS_EXCLUDED)
# We only need these if we're using LTTng
Expand Down
4 changes: 2 additions & 2 deletions tracetools/include/tracetools/tracetools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <stdbool.h>

#include "tracetools/config.h"
#include "tracetools/visibility_control.hpp"
#include "tracetools/visibility_control.h"

#ifndef TRACETOOLS_DISABLED
/**
Expand Down Expand Up @@ -134,7 +134,7 @@ extern "C"
/**
* \return `true` if tracing is enabled, `false` otherwise
*/
TRACETOOLS_PUBLIC bool ros_trace_compile_status();
TRACETOOLS_PUBLIC bool ros_trace_compile_status(void);

/// `rcl_init`
/**
Expand Down
6 changes: 3 additions & 3 deletions ...include/tracetools/visibility_control.hpp → ...s/include/tracetools/visibility_control.h
View file
Open in desktop
clalancette marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* library cannot have, but the consuming code must have inorder to link.
*/

#ifndef TRACETOOLS__VISIBILITY_CONTROL_HPP_
#define TRACETOOLS__VISIBILITY_CONTROL_HPP_
#ifndef TRACETOOLS__VISIBILITY_CONTROL_H_
#define TRACETOOLS__VISIBILITY_CONTROL_H_

// This logic was borrowed (then namespaced) from the examples on the gcc wiki:
// https://gcc.gnu.org/wiki/Visibility
Expand Down Expand Up @@ -53,4 +53,4 @@
#define TRACETOOLS_PUBLIC_TYPE
#endif

#endif // TRACETOOLS__VISIBILITY_CONTROL_HPP_
#endif // TRACETOOLS__VISIBILITY_CONTROL_H_
2 changes: 1 addition & 1 deletion tracetools/src/tracetools.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
}
// *INDENT-ON*

bool ros_trace_compile_status()
bool ros_trace_compile_status(void)
{
#ifndef TRACETOOLS_TRACEPOINTS_EXCLUDED
return true;
Expand Down
Loading