From 90ba7f4a92ce437a61efdd1c171bfdf5e2fe4f97 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 13 Jan 2025 18:25:26 +0100 Subject: [PATCH] Mark `CommonValue` as deprecated to generate warnings in old code --- Source/Engine/Core/Types/CommonValue.cpp | 4 ++++ Source/Engine/Core/Types/CommonValue.h | 2 +- Source/Engine/Core/Types/Variant.cpp | 4 ++-- Source/Engine/Particles/ParticleEffect.cpp | 2 ++ Source/Engine/Serialization/JsonTools.cpp | 2 ++ Source/Engine/Serialization/JsonWriter.cpp | 2 ++ Source/Engine/Serialization/Stream.cpp | 8 ++++++++ 7 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Source/Engine/Core/Types/CommonValue.cpp b/Source/Engine/Core/Types/CommonValue.cpp index fd69ded3c..2a9d2cd18 100644 --- a/Source/Engine/Core/Types/CommonValue.cpp +++ b/Source/Engine/Core/Types/CommonValue.cpp @@ -3,6 +3,8 @@ #include "CommonValue.h" #include "Engine/Scripting/ScriptingObject.h" +PRAGMA_DISABLE_DEPRECATION_WARNINGS + const CommonValue CommonValue::Zero(0.0f); const CommonValue CommonValue::One(1.0f); const CommonValue CommonValue::Null(static_cast(nullptr)); @@ -176,3 +178,5 @@ void CommonValue::UnlinkObject() { AsObject->Deleted.Unbind(this); } + +PRAGMA_ENABLE_DEPRECATION_WARNINGS diff --git a/Source/Engine/Core/Types/CommonValue.h b/Source/Engine/Core/Types/CommonValue.h index f021b1070..0ff3c6097 100644 --- a/Source/Engine/Core/Types/CommonValue.h +++ b/Source/Engine/Core/Types/CommonValue.h @@ -49,7 +49,7 @@ class ScriptingObject; /// Container for value that can have different types /// [Deprecated on 31.07.2020, expires on 31.07.2022] /// -struct FLAXENGINE_API CommonValue +struct DEPRECATED("Use Variant.") FLAXENGINE_API CommonValue { public: /// diff --git a/Source/Engine/Core/Types/Variant.cpp b/Source/Engine/Core/Types/Variant.cpp index 38a494650..a9d1fb5a4 100644 --- a/Source/Engine/Core/Types/Variant.cpp +++ b/Source/Engine/Core/Types/Variant.cpp @@ -5,7 +5,6 @@ #include "Engine/Core/Collections/HashFunctions.h" #include "Engine/Core/Collections/Dictionary.h" #include "Engine/Content/Asset.h" -#include "Engine/Content/AssetReference.h" #include "Engine/Core/Log.h" #include "Engine/Core/Math/Mathd.h" #include "Engine/Core/Math/BoundingBox.h" @@ -23,7 +22,6 @@ #include "Engine/Scripting/ScriptingObject.h" #include "Engine/Scripting/ManagedCLR/MClass.h" #include "Engine/Scripting/ManagedCLR/MCore.h" -#include "Engine/Scripting/ManagedCLR/MCore.h" #include "Engine/Scripting/ManagedCLR/MUtils.h" #include "Engine/Utilities/Crc.h" #include "Engine/Utilities/StringConverter.h" @@ -889,6 +887,7 @@ Variant::Variant(const Span& v) } } +PRAGMA_DISABLE_DEPRECATION_WARNINGS Variant::Variant(const CommonValue& value) : Variant() { @@ -956,6 +955,7 @@ Variant::Variant(const CommonValue& value) CRASH; } } +PRAGMA_ENABLE_DEPRECATION_WARNINGS Variant::~Variant() { diff --git a/Source/Engine/Particles/ParticleEffect.cpp b/Source/Engine/Particles/ParticleEffect.cpp index f06a9b945..9a89a0154 100644 --- a/Source/Engine/Particles/ParticleEffect.cpp +++ b/Source/Engine/Particles/ParticleEffect.cpp @@ -663,6 +663,7 @@ void ParticleEffect::Deserialize(DeserializeStream& stream, ISerializeModifier* // [Deprecated on 25.11.2018, expires on 25.11.2022] if (modifier->EngineBuild < 6197) { + PRAGMA_DISABLE_DEPRECATION_WARNINGS const auto& overrides = overridesMember->value; ASSERT(overrides.IsArray()); _parametersOverrides.EnsureCapacity(_parametersOverrides.Count() + overrides.Size()); @@ -700,6 +701,7 @@ void ParticleEffect::Deserialize(DeserializeStream& stream, ISerializeModifier* p.Value = Variant(JsonTools::GetCommonValue(mValue->value)); } } + PRAGMA_ENABLE_DEPRECATION_WARNINGS } else { diff --git a/Source/Engine/Serialization/JsonTools.cpp b/Source/Engine/Serialization/JsonTools.cpp index 689ce58c2..7d6faf4ff 100644 --- a/Source/Engine/Serialization/JsonTools.cpp +++ b/Source/Engine/Serialization/JsonTools.cpp @@ -284,6 +284,7 @@ DateTime JsonTools::GetDateTime(const Value& value) return DateTime(value.GetInt64()); } +PRAGMA_DISABLE_DEPRECATION_WARNINGS CommonValue JsonTools::GetCommonValue(const Value& value) { // [Deprecated on 31.07.2020, expires on 31.07.2022] @@ -363,3 +364,4 @@ CommonValue JsonTools::GetCommonValue(const Value& value) } return result; } +PRAGMA_ENABLE_DEPRECATION_WARNINGS diff --git a/Source/Engine/Serialization/JsonWriter.cpp b/Source/Engine/Serialization/JsonWriter.cpp index 58ee2c126..673262a7f 100644 --- a/Source/Engine/Serialization/JsonWriter.cpp +++ b/Source/Engine/Serialization/JsonWriter.cpp @@ -244,6 +244,7 @@ void JsonWriter::Matrix(const ::Matrix& value) EndObject(); } +PRAGMA_DISABLE_DEPRECATION_WARNINGS void JsonWriter::CommonValue(const ::CommonValue& value) { // [Deprecated on 31.07.2020, expires on 31.07.2022] @@ -319,6 +320,7 @@ void JsonWriter::CommonValue(const ::CommonValue& value) EndObject(); } +PRAGMA_ENABLE_DEPRECATION_WARNINGS void JsonWriter::Transform(const ::Transform& value) { diff --git a/Source/Engine/Serialization/Stream.cpp b/Source/Engine/Serialization/Stream.cpp index a225ca8f5..192769732 100644 --- a/Source/Engine/Serialization/Stream.cpp +++ b/Source/Engine/Serialization/Stream.cpp @@ -105,6 +105,7 @@ void ReadStream::Read(String& data, int16 lock) } } +PRAGMA_DISABLE_DEPRECATION_WARNINGS void ReadStream::Read(CommonValue& data) { // [Deprecated on 31.07.2020, expires on 31.07.2022] @@ -233,6 +234,7 @@ void ReadStream::Read(CommonValue& data) default: CRASH; } } +PRAGMA_ENABLE_DEPRECATION_WARNINGS void ReadStream::Read(VariantType& data) { @@ -547,10 +549,12 @@ void ReadStream::ReadString(String* data, int16 lock) Read(*data, lock); } +PRAGMA_DISABLE_DEPRECATION_WARNINGS void ReadStream::ReadCommonValue(CommonValue* data) { Read(*data); } +PRAGMA_ENABLE_DEPRECATION_WARNINGS void ReadStream::ReadVariantType(VariantType* data) { @@ -735,6 +739,7 @@ void WriteStream::Write(const StringAnsiView& data, int8 lock) WriteUint8((uint8)((uint8)data[i] ^ lock)); } +PRAGMA_DISABLE_DEPRECATION_WARNINGS void WriteStream::Write(const CommonValue& data) { // [Deprecated on 31.07.2020, expires on 31.07.2022] @@ -797,6 +802,7 @@ void WriteStream::Write(const CommonValue& data) default: CRASH; } } +PRAGMA_ENABLE_DEPRECATION_WARNINGS void WriteStream::Write(const VariantType& data) { @@ -997,10 +1003,12 @@ void WriteStream::WriteStringAnsi(const StringAnsiView& data, int8 lock) Write(data, lock); } +PRAGMA_DISABLE_DEPRECATION_WARNINGS void WriteStream::WriteCommonValue(const CommonValue& data) { Write(data); } +PRAGMA_ENABLE_DEPRECATION_WARNINGS void WriteStream::WriteVariantType(const VariantType& data) {