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

Replace BOOST_PP_CAT with TF_PP_CAT in testTraceData #2589

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Replace BOOST_PP_CAT with TF_PP_CAT in testTraceData #2589

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
24 changes: 12 additions & 12 deletions pxr/base/trace/testenv/testTraceData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ PXR_NAMESPACE_USING_DIRECTIVE
TraceCollector::GetInstance().StoreData(name, value);

#define TRACE_FUNCTION_ARGS_INSTANCE(instance, name, prettyName, ...) \
constexpr static TraceStaticKeyData BOOST_PP_CAT(TraceKeyData_, instance)( \
constexpr static TraceStaticKeyData TF_PP_CAT(TraceKeyData_, instance)( \
name, prettyName); \
_TRACE_ARGS_TO_STATIC_VARS(BOOST_PP_CAT(TraceKeyData_, instance), __VA_ARGS__); \
TraceScopeAuto BOOST_PP_CAT(TraceScopeAuto_, instance)(\
BOOST_PP_CAT(TraceKeyData_, instance), \
_TRACE_ARGS_TO_FUNC_PARAMS(BOOST_PP_CAT(TraceKeyData_, instance), \
_TRACE_ARGS_TO_STATIC_VARS(TF_PP_CAT(TraceKeyData_, instance), __VA_ARGS__); \
TraceScopeAuto TF_PP_CAT(TraceScopeAuto_, instance)(\
TF_PP_CAT(TraceKeyData_, instance), \
_TRACE_ARGS_TO_FUNC_PARAMS(TF_PP_CAT(TraceKeyData_, instance), \
__VA_ARGS__));

#define TRACE_SCOPE_ARGS_INSTANCE(instance, name, ...) \
constexpr static TraceStaticKeyData BOOST_PP_CAT(TraceKeyData_, instance)(name); \
_TRACE_ARGS_TO_STATIC_VARS(BOOST_PP_CAT(TraceKeyData_, instance), __VA_ARGS__); \
TraceScopeAuto BOOST_PP_CAT(TraceScopeAuto_, instance)(\
BOOST_PP_CAT(TraceKeyData_, instance), \
_TRACE_ARGS_TO_FUNC_PARAMS(BOOST_PP_CAT(TraceKeyData_, instance), \
constexpr static TraceStaticKeyData TF_PP_CAT(TraceKeyData_, instance)(name); \
_TRACE_ARGS_TO_STATIC_VARS(TF_PP_CAT(TraceKeyData_, instance), __VA_ARGS__); \
TraceScopeAuto TF_PP_CAT(TraceScopeAuto_, instance)(\
TF_PP_CAT(TraceKeyData_, instance), \
_TRACE_ARGS_TO_FUNC_PARAMS(TF_PP_CAT(TraceKeyData_, instance), \
__VA_ARGS__));

#define _TRACE_KEY_FROM_TUPLE(r, data, elem) BOOST_PP_TUPLE_ELEM(2, 0, elem)
Expand All @@ -92,14 +92,14 @@ TraceScopeAuto BOOST_PP_CAT(TraceScopeAuto_, instance)(\
_TRACE_VALUE_FROM_TUPLE, _, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__)\
)
#define _TRACE_KEY_KEY_DEF(r, data, i, elem) \
constexpr static TraceStaticKeyData BOOST_PP_CAT(data, i)(elem);
constexpr static TraceStaticKeyData TF_PP_CAT(data, i)(elem);

#define _TRACE_ARGS_TO_STATIC_VARS(varname,...) \
BOOST_PP_SEQ_FOR_EACH_I(_TRACE_KEY_KEY_DEF, varname, \
_TRACE_ARGS_TO_KEY_SEQ(__VA_ARGS__))

#define _TRACE_ARG_FUNC_PARAM( r, data, i, elem) \
BOOST_PP_COMMA_IF(i) BOOST_PP_CAT(data, i) BOOST_PP_COMMA() elem
BOOST_PP_COMMA_IF(i) TF_PP_CAT(data, i) BOOST_PP_COMMA() elem
#define _TRACE_ARGS_TO_FUNC_PARAMS(varname, ...) \
BOOST_PP_SEQ_FOR_EACH_I(\
_TRACE_ARG_FUNC_PARAM, varname, _TRACE_ARGS_TO_VAL_SEQ(__VA_ARGS__))
Expand Down