From f1adedd689797dc03790a7014237ff00b9b1d371 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 14 Sep 2022 20:15:50 +0200 Subject: [PATCH] Fix compilation on Clang --- Source/Engine/Networking/NetworkReplicator.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/Engine/Networking/NetworkReplicator.cpp b/Source/Engine/Networking/NetworkReplicator.cpp index 3140ee4aa..46bfc730e 100644 --- a/Source/Engine/Networking/NetworkReplicator.cpp +++ b/Source/Engine/Networking/NetworkReplicator.cpp @@ -35,12 +35,16 @@ struct NetworkReplicatedObject { return Object == other; } -}; + String ToString() const + { #if NETWORK_REPLICATOR_DEBUG_LOG -#include "Engine/Core/Formatting.h" -DEFINE_DEFAULT_FORMATTING(NetworkReplicatedObject, "{}", v.ObjectId.ToString()); + return ObjectId.ToString(); +#else + return Object.GetID().ToString(); #endif + } +}; inline uint32 GetHash(const NetworkReplicatedObject& key) { @@ -87,7 +91,7 @@ void NetworkReplicator::AddObject(ScriptingObject* obj, ScriptingObject* owner) item.OwnerId = owner->GetID(); #if NETWORK_REPLICATOR_DEBUG_LOG item.ObjectId = obj->GetID(); - LOG(Info, "[NetworkReplicator] Add new object {}:{}, owned by {}:{}", item, obj->GetType().ToString(), item.OwnerId, owner->GetType().ToString()); + LOG(Info, "[NetworkReplicator] Add new object {}:{}, owned by {}:{}", item.ToString(), obj->GetType().ToString(), item.OwnerId.ToString(), owner->GetType().ToString()); #endif Objects.Add(MoveTemp(item)); } @@ -132,7 +136,7 @@ void NetworkInternal::NetworkReplicatorUpdate() { // Object got deleted #if NETWORK_REPLICATOR_DEBUG_LOG - LOG(Info, "[NetworkReplicator] Remove object {}, owned by {}", item.Object, item.OwnerId); + LOG(Info, "[NetworkReplicator] Remove object {}, owned by {}", item.ToString(), item.OwnerId.ToString()); #endif Objects.Remove(it); continue; @@ -151,7 +155,7 @@ void NetworkInternal::NetworkReplicatorUpdate() if (!item.InvalidTypeWarn) { item.InvalidTypeWarn = true; - LOG(Error, "[NetworkReplicator] Cannot serialize object {} (missing serialization logic)", item); + LOG(Error, "[NetworkReplicator] Cannot serialize object {} (missing serialization logic)", item.ToString()); } #endif continue;