Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CoMISo
Base
Commits
a0c5f510
Commit
a0c5f510
authored
Feb 04, 2020
by
Martin Marinov
Browse files
Fix the definitions for JOURNAL_[METHOD|FUNCTION]_RETURN_LINK when JOURNAL_ON is disabled
parent
16cbb948
Changes
1
Hide whitespace changes
Inline
Side-by-side
Journal/JournalStream.hh
View file @
a0c5f510
...
...
@@ -585,13 +585,13 @@ template <typename T> auto argument_link(T& _vrbl, const char* const _name,
#define JOURNAL_METHOD_RETURN_LINK(NAME, IMPL, ...) \
::Journal::ReturnLinkT<decltype(IMPL)> JL(rtrn)(NAME); \
JOURNAL(method, JL(rtrn), this, ##__VA_ARGS__) \
return JL(rtrn) = IMPL
;
JOURNAL(method, JL(rtrn), this, ##__VA_ARGS__)
;
\
return JL(rtrn) = IMPL
#define JOURNAL_FUNCTION_RETURN_LINK(NAME, IMPL, ...) \
::Journal::ReturnLinkT<decltype(IMPL)> JL(rtrn)(NAME); \
JOURNAL(function, JL(rtrn), ##__VA_ARGS__) \
return JL(rtrn) = IMPL
;
JOURNAL(function, JL(rtrn), ##__VA_ARGS__)
;
\
return JL(rtrn) = IMPL
#define JOURNAL_PATH_TRANSFORM(TRNS) \
::Journal::stream().set_path_transform(TRNS)
...
...
@@ -621,7 +621,6 @@ template <typename T> auto argument_link(T& _vrbl, const char* const _name,
#define JOURNAL_DESTRUCTOR
#define JOURNAL_METHOD_OUTCOME(...)
#define JOURNAL_METHOD_VOID(...)
#define JOURNAL_METHOD_RETURN_LINK(VRBL, ...)
#define JOURNAL_FUNCTION(VRBL, ...)
#define JOURNAL_FUNCTION_VOID(...)
#define JOURNAL_FUNCTION_OUTCOME(...)
...
...
@@ -641,5 +640,8 @@ template <typename T> auto argument_link(T& _vrbl, const char* const _name,
#define JOURNAL_TYPE_NAME(TYPE)
#define JOURNAL_METHOD_RETURN_LINK(NAME, IMPL, ...) return IMPL
#define JOURNAL_FUNCTION_RETURN_LINK(NAME, IMPL, ...) return IMPL
#endif // JOURNAL_ON
#endif // BASE_JOURNAL_STREAM_HH_INCLUDED
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment