Skip to content

Commit 3382767

Browse files
authored
Merge pull request #116 from bcottDev/release
Resolve compiler errors for clang on Linux
2 parents 0e4c378 + 22962b1 commit 3382767

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Source/GitSourceControl/Private/GitSourceControlModule.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ void FGitSourceControlModule::CreateGitContentBrowserAssetMenu(FMenuBuilder& Men
142142
return;
143143
}
144144

145-
const FString& BranchName = FGitSourceControlModule::Get().GetProvider().GetStatusBranchNames()[0];
145+
const TArray<FString>& StatusBranchNames = FGitSourceControlModule::Get().GetProvider().GetStatusBranchNames();
146+
const FString& BranchName = StatusBranchNames[0];
146147
MenuBuilder.AddMenuEntry(
147148
FText::Format(LOCTEXT("StatusBranchDiff", "Diff against status branch"), FText::FromString(BranchName)),
148149
FText::Format(LOCTEXT("StatusBranchDiffDesc", "Compare this asset to the latest status branch version"), FText::FromString(BranchName)),

Source/GitSourceControl/Private/SGitSourceControlSettings.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
#include "ISourceControlProvider.h"
1010

1111
class SNotificationItem;
12+
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 2
1213
namespace ETextCommit { enum Type : int; }
14+
#else
15+
namespace ETextCommit { enum Type; }
16+
#endif
1317

1418
enum class ECheckBoxState : uint8;
1519

0 commit comments

Comments
 (0)