From 5d2a3482c770abb9ee522d6bd39dce1a62f77cfc Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 5 May 2023 16:10:09 +0200 Subject: [PATCH] Reduce compilation problems by moving `FindObject` fwd decl to be more commonly included #1040 --- Source/Engine/Scripting/ScriptingObject.h | 2 ++ Source/Engine/Serialization/ReadStream.h | 2 -- Source/Engine/Serialization/Serialization.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Engine/Scripting/ScriptingObject.h b/Source/Engine/Scripting/ScriptingObject.h index 5682f2409..183e23297 100644 --- a/Source/Engine/Scripting/ScriptingObject.h +++ b/Source/Engine/Scripting/ScriptingObject.h @@ -267,3 +267,5 @@ API_CLASS(InBuild) class FLAXENGINE_API PersistentScriptingObject : public Scrip public: PersistentScriptingObject(const SpawnParams& params); }; + +extern FLAXENGINE_API class ScriptingObject* FindObject(const Guid& id, class MClass* type); diff --git a/Source/Engine/Serialization/ReadStream.h b/Source/Engine/Serialization/ReadStream.h index 69e86fa4b..37f8b8433 100644 --- a/Source/Engine/Serialization/ReadStream.h +++ b/Source/Engine/Serialization/ReadStream.h @@ -5,8 +5,6 @@ #include "Stream.h" #include "Engine/Core/Templates.h" -extern FLAXENGINE_API class ScriptingObject* FindObject(const Guid& id, class MClass* type); - /// /// Base class for all data read streams /// diff --git a/Source/Engine/Serialization/Serialization.h b/Source/Engine/Serialization/Serialization.h index 7543f8241..182ac71cf 100644 --- a/Source/Engine/Serialization/Serialization.h +++ b/Source/Engine/Serialization/Serialization.h @@ -456,7 +456,7 @@ namespace Serialization Guid id; Deserialize(stream, id, modifier); modifier->IdsMapping.TryGet(id, id); - v = (T*)FindObject(id, T::GetStaticClass()); + v = (T*)::FindObject(id, T::GetStaticClass()); } // Scripting Object Reference