Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed UE5.2 build errors #103

Merged
merged 1 commit into from
May 12, 2023
Merged

Fixed UE5.2 build errors #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Source/GitSourceControl/Private/GitSourceControlProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,11 +520,6 @@ TOptional<int> FGitSourceControlProvider::GetNumLocalChanges() const
#endif

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 2
bool FGitSourceControlProvider::CanExecuteOperation( const FSourceControlOperationRef& InOperation ) const
{
return WorkersMap.Find(InOperation->GetName()) != nullptr;
}

bool FGitSourceControlProvider::AllowsDiffAgainstDepot() const
{
return true;
Expand All @@ -539,6 +534,12 @@ bool FGitSourceControlProvider::UsesSnapshots() const
{
return false;
}
#endif

#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3
bool FGitSourceControlProvider::CanExecuteOperation(const FSourceControlOperationRef& InOperation) const {
return WorkersMap.Find(InOperation->GetName()) != nullptr;
}

TMap<ISourceControlProvider::EStatus, FString> FGitSourceControlProvider::GetStatus() const
{
Expand Down
4 changes: 3 additions & 1 deletion Source/GitSourceControl/Private/GitSourceControlProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,11 @@ class FGitSourceControlProvider : public ISourceControlProvider
#endif
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 2
virtual bool AllowsDiffAgainstDepot() const override;
virtual bool CanExecuteOperation( const FSourceControlOperationRef& InOperation ) const override;
virtual bool UsesUncontrolledChangelists() const override;
virtual bool UsesSnapshots() const override;
#endif
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3
virtual bool CanExecuteOperation( const FSourceControlOperationRef& InOperation ) const override;
virtual TMap<EStatus, FString> GetStatus() const override;
#endif
virtual void Tick() override;
Expand Down