ensureOnce is now ensure.

ensure is now ensureAlways.
Redundant ensureMsg removed and replaced with ensureMsgf.
'debug ensureAlways' command added.

#codereview robert.manuszewski
#platformnotify josh.adams

[CL 2616422 by Steve Robb in Main branch]
This commit is contained in:
Steve Robb
2015-07-10 05:31:32 -04:00
committed by Steve.Robb@epicgames.com
parent 5ee0876637
commit 72dec33d8f
54 changed files with 95 additions and 89 deletions

View File

@@ -147,7 +147,7 @@ FString FBlueprintCompilerCppBackend::TermToText(const FBPTerminal* Term, const
}
else
{
ensureMsg(false, TEXT("It is not possible to express this interface property as a literal value!"));
ensureMsgf(false, TEXT("It is not possible to express this interface property as a literal value!"));
return Term->Name;
}
}
@@ -155,7 +155,7 @@ FString FBlueprintCompilerCppBackend::TermToText(const FBPTerminal* Term, const
// else if (CoerceProperty->IsA(UMulticastDelegateProperty::StaticClass()))
// Cannot assign a literal to a multicast delegate; it should be added instead of assigned
{
ensureMsg(false, TEXT("It is not possible to express this type as a literal value!"));
ensureMsgf(false, TEXT("It is not possible to express this type as a literal value!"));
return Term->Name;
}
}

View File

@@ -221,7 +221,7 @@ TOptional<FDirectoryState> FAsyncDirectoryReader::GetLiveState()
{
TOptional<FDirectoryState> OldState;
if (ensureMsg(IsComplete(), TEXT("Invalid property access from thread before task completion")))
if (ensureMsgf(IsComplete(), TEXT("Invalid property access from thread before task completion")))
{
Swap(OldState, LiveState);
}
@@ -234,7 +234,7 @@ TOptional<FDirectoryState> FAsyncDirectoryReader::GetCachedState()
{
TOptional<FDirectoryState> OldState;
if (ensureMsg(IsComplete(), TEXT("Invalid property access from thread before task completion")))
if (ensureMsgf(IsComplete(), TEXT("Invalid property access from thread before task completion")))
{
Swap(OldState, CachedState);
}

View File

@@ -348,7 +348,7 @@ struct FFileCacheConfig
/** Set up this cache to generate MD5 hashes for its constituent files */
FFileCacheConfig& RequireFileHashes(bool bInRequireFileHashes)
{
if (ensureMsg(bInRequireFileHashes || !bDetectMoves, TEXT("Unable to disable file hashing when move detection is enabled")))
if (ensureMsgf(bInRequireFileHashes || !bDetectMoves, TEXT("Unable to disable file hashing when move detection is enabled")))
{
bRequireFileHashes = bInRequireFileHashes;
}