Attempted fix for shadowed variable warning

[CL 2644954 by Ryan Gerleve in Main branch]
This commit is contained in:
Ryan Gerleve
2015-08-05 11:23:56 -04:00
committed by Ryan.Gerleve@epicgames.com
parent e05bc1bc57
commit f59865ad4a

View File

@@ -716,14 +716,14 @@ FString FEmitDefaultValueHelper::GenerateGetDefaultValue(const UUserDefinedStruc
void FEmitDefaultValueHelper::InnerGenerate(const UProperty* Property, const uint8* ValuePtr, const FString& PathToMember, FString& OutResult)
{
auto OneLineConstruction = [](const UProperty* Property, const uint8* LocalValuePtr, FString& OutResult) -> bool
auto OneLineConstruction = [](const UProperty* LocalProperty, const uint8* LocalValuePtr, FString& OutResult) -> bool
{
FString ValueStr;
bool bComplete = true;
if (!HandleSpecialTypes(Property, LocalValuePtr, ValueStr))
if (!HandleSpecialTypes(LocalProperty, LocalValuePtr, ValueStr))
{
auto StructProperty = Cast<const UStructProperty>(Property);
Property->ExportTextItem(ValueStr, LocalValuePtr, LocalValuePtr, nullptr, EPropertyPortFlags::PPF_ExportCpp);
auto StructProperty = Cast<const UStructProperty>(LocalProperty);
LocalProperty->ExportTextItem(ValueStr, LocalValuePtr, LocalValuePtr, nullptr, EPropertyPortFlags::PPF_ExportCpp);
if (ValueStr.IsEmpty() && StructProperty)
{
check(StructProperty->Struct);
@@ -732,7 +732,7 @@ void FEmitDefaultValueHelper::InnerGenerate(const UProperty* Property, const uin
}
if (ValueStr.IsEmpty())
{
UE_LOG(LogK2Compiler, Warning, TEXT("FEmitDefaultValueHelper Cannot generate initilization: %s"), *Property->GetPathName());
UE_LOG(LogK2Compiler, Warning, TEXT("FEmitDefaultValueHelper Cannot generate initilization: %s"), *LocalProperty->GetPathName());
}
}
OutResult += ValueStr;