izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

VS2015 - Fixing a host of compiler issues when using VS2015 toolset

Browse Source 
Lots of shadow variable issues in header files
Type narrowing mismatches between integer types.
Fixed some variable names which conflicted with private members, this works around a bug in VC14

Commiting some of Jeff's code changes from 2605975

#platformnotify Josh.Adams

#CodeReview Jeff.Campeau

[CL 2613285 by Terence Burns in Main branch]
This commit is contained in:
Terence Burns
2015-07-08 04:48:54 -04:00
committed by Terence.Burns@epicgames.com
parent 3bdf9b06ea
commit bb15af7373
110 changed files with 342 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/CoreUObject/Public/Serialization/AsyncLoading.h
+1 -1
View File
@@ -228,7 +228,7 @@ public:
*
* @return true if we finished calling PostLoad on all loaded objects and no new ones were created, false otherwise
*/
EAsyncPackageState::Type PostLoadDeferredObjects(double InTickStartTime, bool bUseTimeLimit, float& InOutTimeLimit);
EAsyncPackageState::Type PostLoadDeferredObjects(double InTickStartTime, bool bInUseTimeLimit, float& InOutTimeLimit);
private:
/**
Engine/Source/Runtime/CoreUObject/Public/Serialization/BulkData.h
+1 -1
View File
@@ -575,7 +575,7 @@ public:
}
Formats.Empty();
}
COREUOBJECT_API void Serialize(FArchive& Ar, UObject* Owner, const TArray<FName>* FormatsToSave = NULL, bool bSingleUse = true, uint32 Alignment = DEFAULT_ALIGNMENT);
COREUOBJECT_API void Serialize(FArchive& Ar, UObject* Owner, const TArray<FName>* FormatsToSave = NULL, bool bSingleUse = true, uint32 InAlignment = DEFAULT_ALIGNMENT);
};
#endif