Skip to content

Commit 8d898b5

Browse files
Remove deprecated TRACEPOINT macros (#123)
Signed-off-by: Christophe Bedard <[email protected]>
1 parent 63f060e commit 8d898b5

File tree

2 files changed

+3
-36
lines changed

2 files changed

+3
-36
lines changed

tracetools/Doxyfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@ EXCLUDE_SYMBOLS = \
3636
"_GET_MACRO_DO_TRACEPOINT" \
3737
"_GET_MACRO_DECLARE_TRACEPOINT" \
3838
"_DECLARE_TRACEPOINT" \
39-
"TRACEPOINT" \
40-
"TRACEPOINT_ENABLED" \
41-
"DO_TRACEPOINT" \
42-
"_deprecated_macro_TRACEPOINT" \
43-
"_deprecated_macro_TRACEPOINT_ENABLED" \
44-
"_deprecated_macro_DO_TRACEPOINT" \
39+
"TRACETOOLS_TRACEPOINT" \
40+
"TRACETOOLS_TRACEPOINT_ENABLED" \
41+
"TRACETOOLS_DO_TRACEPOINT" \
4542
"tracetools::detail*"
4643

4744
# Tag files that do not exist will produce a warning and cross-project linking will not work.

tracetools/include/tracetools/tracetools.h

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -123,36 +123,6 @@
123123
# define TRACETOOLS_DO_TRACEPOINT(...) ((void) (0))
124124
# define _DECLARE_TRACEPOINT(...)
125125
#endif // TRACETOOLS_DISABLED
126-
127-
// TODO(christophebedard) remove in Rolling after J-turtle release
128-
#ifndef DOXYGEN_ONLY
129-
# ifndef _WIN32
130-
# define _DEPRECATED_WITH_MSG(msg) __attribute__((deprecated(msg)))
131-
# else
132-
# define _DEPRECATED_WITH_MSG(msg) __declspec(deprecated(msg))
133-
# endif
134-
#else
135-
# define _DEPRECATED_WITH_MSG(msg)
136-
#endif
137-
#define _DEPRECATED_MACRO_FUNCTION_DEFINITION(macro_name) \
138-
static inline void \
139-
_DEPRECATED_WITH_MSG("use TRACETOOLS_" #macro_name "() instead") \
140-
_deprecated_macro_ ## macro_name(void) \
141-
{ \
142-
}
143-
144-
_DEPRECATED_MACRO_FUNCTION_DEFINITION(TRACEPOINT)
145-
#define TRACEPOINT(...) \
146-
_deprecated_macro_TRACEPOINT(); \
147-
TRACETOOLS_TRACEPOINT(__VA_ARGS__)
148-
_DEPRECATED_MACRO_FUNCTION_DEFINITION(TRACEPOINT_ENABLED)
149-
#define TRACEPOINT_ENABLED(...) \
150-
_deprecated_macro_TRACEPOINT_ENABLED(); \
151-
TRACETOOLS_TRACEPOINT_ENABLED(__VA_ARGS__)
152-
_DEPRECATED_MACRO_FUNCTION_DEFINITION(DO_TRACEPOINT)
153-
#define DO_TRACEPOINT(...) \
154-
_deprecated_macro_DO_TRACEPOINT(); \
155-
TRACETOOLS_DO_TRACEPOINT(__VA_ARGS__)
156126
// *INDENT-ON*
157127

158128
#ifdef __cplusplus

0 commit comments

Comments
 (0)