release 1.4.2

jagt · jagt · commit 719b33cff031 · 2023-08-01T22:21:02.000+08:00
diff --git a/DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/MsgPack/DcMsgPackTransientDeserializers.cpp b/DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/MsgPack/DcMsgPackTransientDeserializers.cpp
@@ -92,15 +92,16 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientWeakObjectPtr(FDcReader* Re
 	return DcOk();
 }
 
-static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientScriptDelegate(FDcReader* Reader, DcSerDeCommon::FScriptDelegateAccess& ValueAccess)
+template<typename TDelegate>
+static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientScriptDelegate(FDcReader* Reader, DcSerDeCommon::TDelegateAccess<TDelegate>& ValueAccess)
 {
 	using DcSerDeCommon::FWeakObjectPtrAccess;
-	FWeakObjectPtrAccess& WeakAccess = (FWeakObjectPtrAccess&)ValueAccess.Object;
+	FWeakObjectPtrAccess& WeakAccess = (FWeakObjectPtrAccess&)ValueAccess.GetObject();
 
 	DC_TRY(Reader->ReadArrayRoot());
 	DC_TRY(Reader->ReadInt32(&WeakAccess.ObjectIndex));
 	DC_TRY(Reader->ReadInt32(&WeakAccess.ObjectSerialNumber));
-	DC_TRY(ReadTransientName(Reader, ValueAccess.FunctionName));
+	DC_TRY(ReadTransientName(Reader, ValueAccess.GetFunctionName()));
 	DC_TRY(Reader->ReadArrayEnd());
 
 	return DcOk();
@@ -109,6 +110,7 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientScriptDelegate(FDcReader* R
 static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientMulticastScriptDelegate(FDcReader* Reader, DcSerDeCommon::FMulticastScriptDelegateAccess& ValueAccess)
 {
 	using DcSerDeCommon::FScriptDelegateAccess;
+	using FInvocationAccess = DcSerDeCommon::FMulticastScriptDelegateAccess::TypeInvocationAccess;
 	DC_TRY(Reader->ReadArrayRoot());
 
 	while(true)
@@ -118,7 +120,7 @@ static FORCEINLINE_DEBUGGABLE FDcResult ReadTransientMulticastScriptDelegate(FDc
 		if (Next == EDcDataEntry::ArrayEnd)
 			break;
 
-		FScriptDelegateAccess& DelgateAccess = (FScriptDelegateAccess&)ValueAccess.InvocationList.AddDefaulted_GetRef();
+		FInvocationAccess& DelgateAccess = (FInvocationAccess&)ValueAccess.GetInvocationList().AddDefaulted_GetRef();
 		DC_TRY(ReadTransientScriptDelegate(Reader, DelgateAccess));
 	}
 
diff --git a/DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyWriteStates.cpp b/DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyWriteStates.cpp
@@ -175,7 +175,7 @@ FDcResult FDcWriteStateStruct::WriteStructRootAccess(FDcPropertyWriter* Parent,
 		State = EState::ExpectKeyOrEnd;
 		if (Access.Flag & FDcStructAccess::WriteCheckName)
 		{
-			return DcExpect(Access.Name == StructClass->GetFName(), [=] {
+			return DcExpect(Access.Name == StructClass->GetFName(), [&] {
 				return DC_FAIL(DcDReadWrite, StructNameMismatch)
 					<< StructClass->GetFName() << Access.Name
 					<< Parent->FormatHighlight();
@@ -201,7 +201,7 @@ FDcResult FDcWriteStateStruct::WriteStructEndAccess(FDcPropertyWriter* Parent, F
 		State = EState::Ended;
 		if (Access.Flag & FDcStructAccess::WriteCheckName)
 		{
-			return DcExpect(Access.Name == StructClass->GetFName(), [=] {
+			return DcExpect(Access.Name == StructClass->GetFName(), [&] {
 				return DC_FAIL(DcDReadWrite, StructNameMismatch)
 					<< StructClass->GetFName() << Access.Name
 					<< Parent->FormatHighlight();
@@ -351,7 +351,7 @@ FDcResult FDcWriteStateClass::WriteClassRootAccess(FDcPropertyWriter* Parent, FD
 	{
 		if (Access.Flag & FDcClassAccess::WriteCheckName)
 		{
-			DC_TRY(DcExpect(Class->GetFName() == Access.Name, [=]{
+			DC_TRY(DcExpect(Class->GetFName() == Access.Name, [&]{
 				return DC_FAIL(DcDReadWrite, ClassNameMismatch)
 					<< Class->GetFName() << Access.Name
 					<< Parent->FormatHighlight();
@@ -414,7 +414,7 @@ FDcResult FDcWriteStateClass::WriteClassEndAccess(FDcPropertyWriter* Parent, FDc
 	{
 		if (Access.Flag & FDcClassAccess::WriteCheckName)
 		{
-			DC_TRY(DcExpect(Class->GetFName() == Access.Name, [=] {
+			DC_TRY(DcExpect(Class->GetFName() == Access.Name, [&] {
 				return DC_FAIL(DcDReadWrite, ClassNameMismatch)
 					<< Class->GetFName() << Access.Name
 					<< Parent->FormatHighlight();
diff --git a/DataConfig/Source/DataConfigCore/Private/DataConfig/Serialize/Handlers/MsgPack/DcMsgPackTransientSerializers.cpp b/DataConfig/Source/DataConfigCore/Private/DataConfig/Serialize/Handlers/MsgPack/DcMsgPackTransientSerializers.cpp
@@ -30,27 +30,30 @@ static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientName(FDcWriter* Writer, co
 	return DcOk();
 }
 
-static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientScriptDelegate(FDcWriter* Writer, const DcSerDeCommon::FScriptDelegateAccess& ValueAccess)
+template<typename TDelegate>
+static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientScriptDelegate(FDcWriter* Writer, DcSerDeCommon::TDelegateAccess<TDelegate>& ValueAccess)
 {
 	using DcSerDeCommon::FWeakObjectPtrAccess;
-	FWeakObjectPtrAccess& WeakAccess = (FWeakObjectPtrAccess&)(ValueAccess.Object);
+	FWeakObjectPtrAccess& WeakAccess = (FWeakObjectPtrAccess&)(ValueAccess.GetObject());
 
 	DC_TRY(Writer->WriteArrayRoot());
 	DC_TRY(Writer->WriteInt32(WeakAccess.ObjectIndex));
 	DC_TRY(Writer->WriteInt32(WeakAccess.ObjectSerialNumber));
-	DC_TRY(WriteTransientName(Writer, ValueAccess.FunctionName));
+	DC_TRY(WriteTransientName(Writer, ValueAccess.GetFunctionName()));
 	DC_TRY(Writer->WriteArrayEnd());
 
 	return DcOk();
 }
 
-static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientMulticastScriptDelegate(FDcWriter* Writer, const DcSerDeCommon::FMulticastScriptDelegateAccess& ValueAccess)
+static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientMulticastScriptDelegate(FDcWriter* Writer, DcSerDeCommon::FMulticastScriptDelegateAccess& ValueAccess)
 {
 	using DcSerDeCommon::FScriptDelegateAccess;
+	using FInvocationAccess = DcSerDeCommon::FMulticastScriptDelegateAccess::TypeInvocationAccess;
+
 	DC_TRY(Writer->WriteArrayRoot());
-	for (int Ix = 0; Ix < ValueAccess.InvocationList.Num(); Ix++)
+	for (int Ix = 0; Ix < ValueAccess.GetInvocationList().Num(); Ix++)
 	{
-		FScriptDelegateAccess& DelegateAccess = (FScriptDelegateAccess&)(ValueAccess.InvocationList[Ix]);
+		FInvocationAccess& DelegateAccess = (FInvocationAccess&)(ValueAccess.GetInvocationList()[Ix]);
 		DC_TRY(WriteTransientScriptDelegate(Writer, DelegateAccess));
 	}
 	DC_TRY(Writer->WriteArrayEnd());
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/DcVersion.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/DcVersion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define DATA_CONFIG_CORE_VERSION "1.4.1"
-#define DATA_CONFIG_CORE_VERSION_NUMBER 10401
+#define DATA_CONFIG_CORE_VERSION "1.4.2"
+#define DATA_CONFIG_CORE_VERSION_NUMBER 10402
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/Misc/DcDataVariant.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/Misc/DcDataVariant.h
@@ -37,7 +37,7 @@ struct FDcDataVariant
 
 	template<
 		typename T,
-		typename TActual = typename TRemoveConst<typename TRemoveReference<T>::Type>::Type,
+		typename TActual = typename DcTypeUtils::TRemoveConst<typename TRemoveReference<T>::Type>::Type,
 		typename X = typename TEnableIf<TDcIsDataVariantCompatible<TActual>::Value, void>::Type
 	>
 	FDcDataVariant(T&& InValue)
@@ -55,7 +55,7 @@ struct FDcDataVariant
 	template<typename T>
 	FORCEINLINE void Initialize(T InValue)
 	{
-		using TActual = typename TRemoveConst<typename TRemoveReference<T>::Type>::Type;
+		using TActual = typename DcTypeUtils::TRemoveConst<typename TRemoveReference<T>::Type>::Type;
 		DataType = DcTypeUtils::TDcDataEntryType<TActual>::Value;
 		bDataTypeOnly = false;
 
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/Misc/DcTypeUtils.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/Misc/DcTypeUtils.h
@@ -94,5 +94,16 @@ struct TIsSame
 #endif
 };
 
+template<typename T>
+struct TRemoveConst
+{
+#if UE_VERSION_OLDER_THAN(5, 3, 0)
+	using Type = typename ::TRemoveConst<T>::Type;
+#else
+	using Type = std::remove_const_t<T>;
+#endif
+};
+
+
 } // namespace DcTypeUtils
 
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/Property/DcPropertyUtils.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/Property/DcPropertyUtils.h
@@ -54,6 +54,10 @@ DATACONFIGCORE_API FString GetFormatPropertyTypeName(UScriptStruct* Struct);
 DATACONFIGCORE_API FString GetFormatPropertyTypeName(UClass* Class);
 DATACONFIGCORE_API FString GetFormatPropertyTypeName(const FFieldVariant& Field);
 
+#if ENGINE_MAJOR_VERSION == 5
+FORCEINLINE FString GetFormatPropertyTypeName(TObjectPtr<UClass> Ptr) { return GetFormatPropertyTypeName(Ptr.Get()); }
+FORCEINLINE FString GetFormatPropertyTypeName(TObjectPtr<UScriptStruct> Ptr) { return GetFormatPropertyTypeName(Ptr.Get()); }
+#endif
 
 DATACONFIGCORE_API bool IsSubObjectProperty(FObjectProperty* ObjectProperty);
 DATACONFIGCORE_API bool IsUnsignedProperty(FNumericProperty* NumericProperty);
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/SerDe/DcDeserializeCommon.inl b/DataConfig/Source/DataConfigCore/Public/DataConfig/SerDe/DcDeserializeCommon.inl
@@ -12,6 +12,7 @@
 #include "DataConfig/Diagnostic/DcDiagnosticSerDe.h"
 #include "DataConfig/SerDe/DcSerDeUtils.h"
 #include "UObject/Package.h"
+#include "Misc/EngineVersionComparison.h"
 
 FORCEINLINE_DEBUGGABLE FDcResult TryReadObjectReference(FDcDeserializeContext& Ctx, FObjectPropertyBase* ObjectProperty, UObject*& OutObject)
 {
@@ -28,8 +29,14 @@ FORCEINLINE_DEBUGGABLE FDcResult TryReadObjectReference(FDcDeserializeContext& C
 			&& Value.EndsWith(TEXT("'")))
 		{
 			//	SkeletalMesh'/Engine/EditorMeshes/SkeletalMesh/DefaultSkeletalMesh.DefaultSkeletalMesh'
-			//	UE4 copied reference style
+			//	UE copied reference style
+
+#if UE_VERSION_OLDER_THAN(5, 3, 0)
 			UObject* Loaded = nullptr;
+#else
+			TObjectPtr<UObject> Loaded = nullptr;
+#endif
+
 			const TCHAR* ValueBuffer = *Value;
 			if (FObjectPropertyBase::ParseObjectPropertyValue(
 				ObjectProperty,
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/SerDe/DcSerDeCommon.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/SerDe/DcSerDeCommon.h
@@ -13,18 +13,27 @@ struct FWeakObjectPtrAccess
 };
 static_assert(sizeof(FWeakObjectPtrAccess) == sizeof(FWeakObjectPtr), "FWeakObjectPtrAccess stale");
 
-struct FScriptDelegateAccess
+template<typename TDelegate>
+struct TDelegateAccess : public TDelegate
 {
-	FWeakObjectPtr Object;
-	FName FunctionName;
+	FORCEINLINE FWeakObjectPtr& GetObject() { return this->Object; }
+	FORCEINLINE FName& GetFunctionName() { return this->FunctionName; }
 };
-static_assert(sizeof(FScriptDelegateAccess) == sizeof(FScriptDelegate), "FScriptDelegateAccess stale");
 
-struct FMulticastScriptDelegateAccess
+using FScriptDelegateAccess = TDelegateAccess<FScriptDelegate>;
+
+struct FMulticastScriptDelegateAccess : public FMulticastScriptDelegate
 {
-	FMulticastScriptDelegate::FInvocationList InvocationList;
+#if UE_VERSION_OLDER_THAN(5, 3, 0)
+	using TypeInvocationList = FMulticastScriptDelegate::FInvocationList;
+#else
+	using TypeInvocationList = FMulticastScriptDelegate::InvocationListType;
+#endif
+
+	using TypeInvocationAccess = TDelegateAccess<typename TypeInvocationList::ElementType>;
+
+	FORCEINLINE TypeInvocationList& GetInvocationList() { return InvocationList; }
 };
-static_assert(sizeof(FMulticastScriptDelegateAccess) == sizeof(FMulticastScriptDelegate), "FMulticastScriptDelegateAccess stale");
 
 struct FTextAccess
 {
diff --git a/DataConfig/Source/DataConfigEditorExtra/Private/DataConfig/EditorExtra/SerDe/DcSerDeBlueprint.cpp b/DataConfig/Source/DataConfigEditorExtra/Private/DataConfig/EditorExtra/SerDe/DcSerDeBlueprint.cpp
@@ -90,8 +90,14 @@ static FDcResult TryReadClassReferenceWithBlueprint(FDcDeserializeContext& Ctx,
 			&& Value.EndsWith(TEXT("'")))
 		{
 			//	SkeletalMesh'/Engine/EditorMeshes/SkeletalMesh/DefaultSkeletalMesh.DefaultSkeletalMesh'
-			//	UE4 copied reference style
+			//	UE copied reference style
+#if UE_VERSION_OLDER_THAN(5, 3, 0)
 			UObject* Loaded = nullptr;
+#else
+			TObjectPtr<UObject> Loaded = nullptr;
+#endif
+
+
 			const TCHAR* ValueBuffer = *Value;
 			if (FObjectPropertyBase::ParseObjectPropertyValue(
 				ObjectProperty,
diff --git a/DataConfig/Source/DataConfigEditorExtra/Public/DataConfig/EditorExtra/SerDe/DcSerDeGameplayTags.h b/DataConfig/Source/DataConfigEditorExtra/Public/DataConfig/EditorExtra/SerDe/DcSerDeGameplayTags.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GameplayTags/Public/GameplayTags.h"
+#include "GameplayTags.h"
 #include "DataConfig/Deserialize/DcDeserializeTypes.h"
 #include "DataConfig/Serialize/DcSerializeTypes.h"
 #include "DcSerDeGameplayTags.generated.h"
diff --git a/DataConfig/Source/DataConfigHeadless/DataConfigHeadless.Target.cs b/DataConfig/Source/DataConfigHeadless/DataConfigHeadless.Target.cs
@@ -13,7 +13,6 @@ public DataConfigHeadlessTarget(TargetInfo Target) : base(Target)
 		LinkType = TargetLinkType.Monolithic;
 
 		MinGameModuleSourceFilesForUnityBuild = 2;
-		bUseMallocProfiler = false;
 
 		//	! need this for logging
         bUseLoggingInShipping = true;
@@ -35,6 +34,9 @@ public DataConfigHeadlessTarget(TargetInfo Target) : base(Target)
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
 #endif
 
+#if UE_5_3_OR_LATER
+		DefaultBuildSettings = BuildSettingsVersion.V4;
+#endif
 		//	toggle to use clang-cl
 		//	it works mostly except breaks FName natvis
 		// WindowsPlatform.Compiler = WindowsCompiler.Clang;
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Chen Tao 
+Copyright (c) 2021-2023 Chen Tao 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Misc/Docs/Source/Advanced/NoMetaData.md b/Misc/Docs/Source/Advanced/NoMetaData.md
@@ -1,13 +1,13 @@
 # No MetaData
 
-Some DataConfig behaviors take advantage of [property metadata][1], notable the default `DcSkip` metadata to let DataConfig ignore a property:
+Some DataConfig behaviors take advantage of [property metadata][1]. For example the default `DcSkip` metadata let DataConfig ignore marked property:
 
 ```c++
 //  DataConfigTests/Private/DcTestProperty3.h
 UPROPERTY(meta = (DcSkip)) int SkipField1;
 ```
 
-However the metadata would be trimmed in packaged builds, meanwhile the `FProperty::GetMetaData/HasMetaData()` methods would be gone. The state is roughly like this:
+However the metadata would be stripped in packaged builds and `FProperty::GetMetaData/HasMetaData()` set of methods would be gone. The state is roughly like this:
 
 1. In [packaged builds][2] there's no metadata C++ methods nor any data.
 2. Program targets can choose whether to keep metadata methods by setting `bBuildWithEditorOnlyData` in `Target.cs`. This toggles macro `WITH_EDITORONLY_DATA`.
@@ -16,17 +16,18 @@ However the metadata would be trimmed in packaged builds, meanwhile the `FProper
 
 In release 1.4.1 we fixed compilation on `!WITH_EDITORONLY_DATA`. This would allow you to include `DataConfigCore` as a runtime module and ship it with your project. This is an intended and supported use case.
 
-However some builtin DataConfig features are affected in builds with no metadata.
+However with no metadata some default DataConfig behaviors would be different:
 
 * All builtin metas (`DcSkip/DcMsgPackBlob`) are ignored.
 * Bitflag enums (`UENUM(meta = (Bitflags))`) are ignored. All enums are now treated as scalar.
 
-The good news is that DataConfig allows you to workaround this [by writing custom serialization handlers](../Programming/SerializerDeserializer.md). For example for bitflag enums:
+The good news is that you can workaround this [by writing custom serialization handlers](../Programming/SerializerDeserializer.md). For example for bitflag enums:
 
 * Name your bitflag enums with a prefix like `EFlagBar` and check for it in predicates.
 * Collect a list of bitflag enum names and test for it in predicates.
 * On serializing `PeekRead` for next data entry. If it's a `ArrayRoot` then treat it as a bitflag enum.
 
+Note that you should be able to implement these without modifying `DataConfigCore` code.
 
 [1]:https://docs.unrealengine.com/en-US/metadata-specifiers-in-unreal-engine/
 [2]:https://docs.unrealengine.com/en-US/packaging-unreal-engine-projects/
diff --git a/Misc/Docs/Source/Advanced/UEUpgrades.md b/Misc/Docs/Source/Advanced/UEUpgrades.md
@@ -2,6 +2,12 @@
 
 DataConfig is committed to support multiple UE versions with no deprecations and warnings. On this page we'll document important upgrade and migration info.
 
+# UE5.3
+
+* Introduces `BuildSettingsVersion.V4` which now defaults to C++ 20.
+* `TRemoveConst` is deprecated over `std::remove_const`.
+* `FScriptDelegate` etc now has additional checkers based on threading model and debug/release build. Thus we change how `FScriptDelegateAccess` works.
+
 # UE5.2
 
 * `TIsSame` is deprecated over `std::is_same`.
diff --git a/Misc/Docs/Source/Changes.md b/Misc/Docs/Source/Changes.md
@@ -2,11 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.4.2 - 2023-8-1
+
+- UE 5.3 support.
+  - See: [UE version upgrade 5.3](Advanced/UEUpgrades.md#ue53)
+
+
 ## 1.4.1 - 2023-2-15
 
 - Fix compilation on `!WITH_EDITORONLY_DATA`.
   - See [No MetaData](Advanced/NoMetaData.md).
-- Initial UE 5.2 support.
+- UE 5.2 support.
+  - See: [UE version upgrade 5.2](Advanced/UEUpgrades.md#ue52)
 
 ## 1.4.0 - 2022-11-17
 
diff --git a/Misc/Docs/Source/Integration.md b/Misc/Docs/Source/Integration.md
@@ -2,6 +2,8 @@
 
 At the moment it supports these the engine versions below:
 
+- UE 5.3 
+- UE 5.2 
 - UE 5.1 
 - UE 5.0 
 - UE 4.27
@@ -10,11 +12,33 @@ At the moment it supports these the engine versions below:
 
 ## Integrate `DataConfig` Plugin
 
-The easiest way to try out DataConfig is to add it as a plugin into your C++ project.  In this section we'll walk through the steps of integrating DataConfig plugin into a empty UE C++ Project.
+The easiest way to try out DataConfig is to add it as a plugin into your C++ project.  In this section we'll walk through these steps.
+
+### Download DataConfig Plugin
+
+The quickest way to try out DataConfig is to download the latest release at [DataConfig releases][2] page.
+
+1. Download the zip files on the [releases page][2]. Note there're UE4 and UE5 plugin respectively.
+
+2. Unzip it into your Unreal Engine project's `Plugin` folder. The layout should be like this:
+
+```
+<Your project root>
+|- <Your project>.uproject
+|- Content
+|- Source
+|- ...
+|- Plugins
+   |- DataConfig
+      |- DataConfig.uplugin
+```
+
+3. [Validate DataConfig plugin is integrated corrrectly](#validate-integration).
+
 
 ### Generate DataConfig Plugin for UE4/UE5
 
-DataConfig now uses separated `uplugin` files for UE4 and UE5 so that we can try out new features in UE5 without dropping support for UE4. We bundled scripts to generate clean plugins for UE4 and UE5. You can also find these on [DataConfig releases][2] page.
+DataConfig now uses separated `uplugin` files for UE4 and UE5 so that we can try out new features in UE5 without dropping support for UE4. We bundled scripts to generate clean plugins for UE4 and UE5. This is how the [DataConfig releases][2] are built.
 
 ```shell
 git clone https://github.com/slowburn-dev/DataConfig
diff --git a/Misc/Docs/Source/License.md b/Misc/Docs/Source/License.md
diff --git a/Misc/Docs/Source/SUMMARY.md b/Misc/Docs/Source/SUMMARY.md
diff --git a/Misc/Project/Source/DcProjectEditor/DcProjectEditor.Build.cs b/Misc/Project/Source/DcProjectEditor/DcProjectEditor.Build.cs
diff --git a/Misc/Project/Source/DcProjectGame/DcProjectGame.Build.cs b/Misc/Project/Source/DcProjectGame/DcProjectGame.Build.cs

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ FDcResult FDcWriteStateStruct::WriteStructRootAccess(FDcPropertyWriter* Parent,`
`175`	`175`	`State = EState::ExpectKeyOrEnd;`
`176`	`176`	`if (Access.Flag & FDcStructAccess::WriteCheckName)`
`177`	`177`	`{`
`178`		`- return DcExpect(Access.Name == StructClass->GetFName(), [=] {`
	`178`	`+ return DcExpect(Access.Name == StructClass->GetFName(), [&] {`
`179`	`179`	`return DC_FAIL(DcDReadWrite, StructNameMismatch)`
`180`	`180`	`<< StructClass->GetFName() << Access.Name`
`181`	`181`	`<< Parent->FormatHighlight();`
`@@ -201,7 +201,7 @@ FDcResult FDcWriteStateStruct::WriteStructEndAccess(FDcPropertyWriter* Parent, F`
`201`	`201`	`State = EState::Ended;`
`202`	`202`	`if (Access.Flag & FDcStructAccess::WriteCheckName)`
`203`	`203`	`{`
`204`		`- return DcExpect(Access.Name == StructClass->GetFName(), [=] {`
	`204`	`+ return DcExpect(Access.Name == StructClass->GetFName(), [&] {`
`205`	`205`	`return DC_FAIL(DcDReadWrite, StructNameMismatch)`
`206`	`206`	`<< StructClass->GetFName() << Access.Name`
`207`	`207`	`<< Parent->FormatHighlight();`
`@@ -351,7 +351,7 @@ FDcResult FDcWriteStateClass::WriteClassRootAccess(FDcPropertyWriter* Parent, FD`
`351`	`351`	`{`
`352`	`352`	`if (Access.Flag & FDcClassAccess::WriteCheckName)`
`353`	`353`	`{`
`354`		`- DC_TRY(DcExpect(Class->GetFName() == Access.Name, [=]{`
	`354`	`+ DC_TRY(DcExpect(Class->GetFName() == Access.Name, [&]{`
`355`	`355`	`return DC_FAIL(DcDReadWrite, ClassNameMismatch)`
`356`	`356`	`<< Class->GetFName() << Access.Name`
`357`	`357`	`<< Parent->FormatHighlight();`
`@@ -414,7 +414,7 @@ FDcResult FDcWriteStateClass::WriteClassEndAccess(FDcPropertyWriter* Parent, FDc`
`414`	`414`	`{`
`415`	`415`	`if (Access.Flag & FDcClassAccess::WriteCheckName)`
`416`	`416`	`{`
`417`		`- DC_TRY(DcExpect(Class->GetFName() == Access.Name, [=] {`
	`417`	`+ DC_TRY(DcExpect(Class->GetFName() == Access.Name, [&] {`
`418`	`418`	`return DC_FAIL(DcDReadWrite, ClassNameMismatch)`
`419`	`419`	`<< Class->GetFName() << Access.Name`
`420`	`420`	`<< Parent->FormatHighlight();`
Original file line number	Diff line number	Diff line change
`@@ -30,27 +30,30 @@ static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientName(FDcWriter* Writer, co`
`30`	`30`	`return DcOk();`
`31`	`31`	`}`
`32`	`32`
`33`		`-static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientScriptDelegate(FDcWriter* Writer, const DcSerDeCommon::FScriptDelegateAccess& ValueAccess)`
	`33`	`+template<typename TDelegate>`
	`34`	`+static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientScriptDelegate(FDcWriter* Writer, DcSerDeCommon::TDelegateAccess<TDelegate>& ValueAccess)`
`34`	`35`	`{`
`35`	`36`	`using DcSerDeCommon::FWeakObjectPtrAccess;`
`36`		`- FWeakObjectPtrAccess& WeakAccess = (FWeakObjectPtrAccess&)(ValueAccess.Object);`
	`37`	`+ FWeakObjectPtrAccess& WeakAccess = (FWeakObjectPtrAccess&)(ValueAccess.GetObject());`
`37`	`38`
`38`	`39`	`DC_TRY(Writer->WriteArrayRoot());`
`39`	`40`	`DC_TRY(Writer->WriteInt32(WeakAccess.ObjectIndex));`
`40`	`41`	`DC_TRY(Writer->WriteInt32(WeakAccess.ObjectSerialNumber));`
`41`		`- DC_TRY(WriteTransientName(Writer, ValueAccess.FunctionName));`
	`42`	`+ DC_TRY(WriteTransientName(Writer, ValueAccess.GetFunctionName()));`
`42`	`43`	`DC_TRY(Writer->WriteArrayEnd());`
`43`	`44`
`44`	`45`	`return DcOk();`
`45`	`46`	`}`
`46`	`47`
`47`		`-static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientMulticastScriptDelegate(FDcWriter* Writer, const DcSerDeCommon::FMulticastScriptDelegateAccess& ValueAccess)`
	`48`	`+static FORCEINLINE_DEBUGGABLE FDcResult WriteTransientMulticastScriptDelegate(FDcWriter* Writer, DcSerDeCommon::FMulticastScriptDelegateAccess& ValueAccess)`
`48`	`49`	`{`
`49`	`50`	`using DcSerDeCommon::FScriptDelegateAccess;`
	`51`	`+ using FInvocationAccess = DcSerDeCommon::FMulticastScriptDelegateAccess::TypeInvocationAccess;`
	`52`	`+`
`50`	`53`	`DC_TRY(Writer->WriteArrayRoot());`
`51`		`- for (int Ix = 0; Ix < ValueAccess.InvocationList.Num(); Ix++)`
	`54`	`+ for (int Ix = 0; Ix < ValueAccess.GetInvocationList().Num(); Ix++)`
`52`	`55`	`{`
`53`		`- FScriptDelegateAccess& DelegateAccess = (FScriptDelegateAccess&)(ValueAccess.InvocationList[Ix]);`
	`56`	`+ FInvocationAccess& DelegateAccess = (FInvocationAccess&)(ValueAccess.GetInvocationList()[Ix]);`
`54`	`57`	`DC_TRY(WriteTransientScriptDelegate(Writer, DelegateAccess));`
`55`	`58`	`}`
`56`	`59`	`DC_TRY(Writer->WriteArrayEnd());`