Merge pull request #116 from bcottDev/release

Resolve compiler errors for clang on Linux
ProjectBorealis · Jun 18, 2023 · 3382767 · 3382767
2 parents 0e4c378 + 22962b1
commit 3382767
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Source/GitSourceControl/Private/GitSourceControlModule.cpp b/Source/GitSourceControl/Private/GitSourceControlModule.cpp
@@ -142,7 +142,8 @@ void FGitSourceControlModule::CreateGitContentBrowserAssetMenu(FMenuBuilder& Men
 		return;
 	}
 
-	const FString& BranchName = FGitSourceControlModule::Get().GetProvider().GetStatusBranchNames()[0];
+	const TArray<FString>& StatusBranchNames = FGitSourceControlModule::Get().GetProvider().GetStatusBranchNames();
+	const FString& BranchName = StatusBranchNames[0];
 	MenuBuilder.AddMenuEntry(
 		FText::Format(LOCTEXT("StatusBranchDiff", "Diff against status branch"), FText::FromString(BranchName)),
 		FText::Format(LOCTEXT("StatusBranchDiffDesc", "Compare this asset to the latest status branch version"), FText::FromString(BranchName)),

diff --git a/Source/GitSourceControl/Private/SGitSourceControlSettings.h b/Source/GitSourceControl/Private/SGitSourceControlSettings.h
@@ -9,7 +9,11 @@
 #include "ISourceControlProvider.h"
 
 class SNotificationItem;
+#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 2
 namespace ETextCommit { enum Type : int; }
+#else
+namespace ETextCommit { enum Type; }
+#endif
 
 enum class ECheckBoxState : uint8;