diff options
| author | Per Larsson <[email protected]> | 2022-01-31 14:11:25 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-01-31 14:11:25 +0100 |
| commit | 2f8c474a5b65c15c195359148f6faa5847f12bd5 (patch) | |
| tree | cbaea52862b05801ae9949f2212cd339423bc611 /thirdparty | |
| parent | Initial support for symmetric encryption/decryption using OpenSSL. (diff) | |
| parent | Fixed "int-into-bool-context" error that has mysteriously appeared (diff) | |
| download | zen-2f8c474a5b65c15c195359148f6faa5847f12bd5.tar.xz zen-2f8c474a5b65c15c195359148f6faa5847f12bd5.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/trace/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thirdparty/trace/trace.h b/thirdparty/trace/trace.h index caa862ffe..d7fbbb71f 100644 --- a/thirdparty/trace/trace.h +++ b/thirdparty/trace/trace.h @@ -263,7 +263,7 @@ class FChannel; EventProps_Meta const EventProps_Private = {}; \
typedef std::conditional<bIsImportant, UE::Trace::Private::FImportantLogScope, UE::Trace::Private::FLogScope>::type LogScopeType; \
explicit operator bool () const { return true; } \
- enum { EventFlags = PartialEventFlags|(EventProps_Meta::NumAuxFields ? UE::Trace::Private::FEventInfo::Flag_MaybeHasAux : 0), }; \
+ enum { EventFlags = PartialEventFlags|((EventProps_Meta::NumAuxFields != 0) ? UE::Trace::Private::FEventInfo::Flag_MaybeHasAux : 0), }; \
static_assert( \
!bIsImportant || (uint32(EventFlags) & uint32(UE::Trace::Private::FEventInfo::Flag_NoSync)), \
"Trace events flagged as Important events must be marked NoSync" \
|