niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use '#ifdef' instead of '#if defined()`

Browse source 
Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
This commit is contained in:
Christophe Bedard 2020-02-28 17:37:47 -05:00
parent b2d13721fa
commit 40092071e9
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tracetools/src/tracetools.c
View file

@ -16,7 +16,7 @@
#ifndef TRACETOOLS_DISABLED #ifndef TRACETOOLS_DISABLED
#if defined(TRACETOOLS_LTTNG_ENABLED) #ifdef TRACETOOLS_LTTNG_ENABLED
# include "tracetools/tp_call.h" # include "tracetools/tp_call.h"
# define CONDITIONAL_TP(...) \ # define CONDITIONAL_TP(...) \
tracepoint(TRACEPOINT_PROVIDER, __VA_ARGS__) tracepoint(TRACEPOINT_PROVIDER, __VA_ARGS__)
@ -26,7 +26,7 @@
bool ros_trace_compile_status() bool ros_trace_compile_status()
{ {
#if defined(TRACETOOLS_LTTNG_ENABLED) #ifdef TRACETOOLS_LTTNG_ENABLED
return true; return true;
#else #else
return false; return false;

6
tracetools/src/utils.cpp
View file

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#if defined(TRACETOOLS_LTTNG_ENABLED) #ifdef TRACETOOLS_LTTNG_ENABLED
#include <dlfcn.h> #include <dlfcn.h>
#include <cxxabi.h> #include <cxxabi.h>
#endif #endif
@ -20,7 +20,7 @@
const char * _demangle_symbol(const char * mangled) const char * _demangle_symbol(const char * mangled)
{ {
#if defined(TRACETOOLS_LTTNG_ENABLED) #ifdef TRACETOOLS_LTTNG_ENABLED
char * demangled = nullptr; char * demangled = nullptr;
int status; int status;
demangled = abi::__cxa_demangle(mangled, NULL, 0, &status); demangled = abi::__cxa_demangle(mangled, NULL, 0, &status);
@ -35,7 +35,7 @@ const char * _demangle_symbol(const char * mangled)
const char * _get_symbol_funcptr(void * funcptr) const char * _get_symbol_funcptr(void * funcptr)
{ {
#if defined(TRACETOOLS_LTTNG_ENABLED) #ifdef TRACETOOLS_LTTNG_ENABLED
Dl_info info; Dl_info info;
if (dladdr(funcptr, &info) == 0) { if (dladdr(funcptr, &info) == 0) {
return SYMBOL_UNKNOWN; return SYMBOL_UNKNOWN;