Minor fixes to new casts.

* InterfaceCast deprecation version number changed to 4.6.
* Double-underscored identifiers replaced with names which aren't reserved.

#codereview robert.manuszewski,mike.fricker

[CL 2314098 by Steve Robb in Main branch]
This commit is contained in:
Steve Robb
2014-09-30 07:30:24 -04:00
committed by UnrealBot
parent 8bae3a4daa
commit 04d7d74f86
2 changed files with 47 additions and 44 deletions

View File

@@ -1755,7 +1755,7 @@ void FNativeClassHeaderGenerator::ExportInterfaceClassDeclaration( FClass* Class
// to script VM functions
if (SuperClass->IsChildOf(UInterface::StaticClass()))
{
InterfaceBoilerplate.Logf(TEXT("\tvirtual UObject* __GetUObject() const = 0;\r\n"));
InterfaceBoilerplate.Logf(TEXT("\tvirtual UObject* _getUObject() const = 0;\r\n"));
}
// Replication, add in the declaration for GetLifetimeReplicatedProps() automatically if there are any net flagged properties
@@ -1918,7 +1918,7 @@ void FNativeClassHeaderGenerator::ExportClassHeaderInner(FClass* Class, bool bVa
ClassBoilerplate.Logf(TEXT(" static const TCHAR* StaticConfigName() {return TEXT(\"%s\");}\r\n\r\n"), *Class->ClassConfigName.ToString());
}
ClassBoilerplate.Logf(TEXT("%sUObject* __GetUObject() const { return const_cast<%s*>(this); }\r\n"), FCString::Spc(4), ClassCPPName);
ClassBoilerplate.Logf(TEXT("%sUObject* _getUObject() const { return const_cast<%s*>(this); }\r\n"), FCString::Spc(4), ClassCPPName);
// Replication, add in the declaration for GetLifetimeReplicatedProps() automatically if there are any net flagged properties
for( TFieldIterator<UProperty> It(Class,EFieldIteratorFlags::ExcludeSuper); It; ++It )