aboutsummaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
authorzousar <[email protected]>2022-02-01 21:33:57 -0700
committerzousar <[email protected]>2022-02-01 21:33:57 -0700
commit7f12ac47b01639e8e67d04388a6f971271d25c52 (patch)
tree53ac2f2a844785bf5543cd62a692985f0b0ff385 /thirdparty
parentMerge branch 'main' into non-elevated-asio (diff)
parentCacheRecordPolicy: Fix inverted PolicyMask expression that caused parsing Val... (diff)
downloadzen-7f12ac47b01639e8e67d04388a6f971271d25c52.tar.xz
zen-7f12ac47b01639e8e67d04388a6f971271d25c52.zip
Merge branch 'main' into non-elevated-asio
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/trace/trace.h2
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" \