#5643: Fix Linux build

codereader · Jun 20, 2021 · 2205cdc · 2205cdc
1 parent a8e3607
commit 2205cdc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/libs/scene/merge/MergeAction.h b/libs/scene/merge/MergeAction.h
@@ -285,18 +285,18 @@ class ConflictResolutionAction :
     INodePtr _conflictingEntity;
 
     // The action the source diff is trying to apply
-    MergeAction::Ptr _sourceAction;
+    IMergeAction::Ptr _sourceAction;
     // The action that happened in the target
-    MergeAction::Ptr _targetAction;
+    IMergeAction::Ptr _targetAction;
 
     ResolutionType _resolution;
 
 protected:
-    ConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingEntity, const MergeAction::Ptr& sourceAction) :
-        ConflictResolutionAction(conflictType, conflictingEntity, sourceAction, MergeAction::Ptr())
+    ConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingEntity, const IMergeAction::Ptr& sourceAction) :
+        ConflictResolutionAction(conflictType, conflictingEntity, sourceAction, IMergeAction::Ptr())
     {}
 
-    ConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingEntity, const MergeAction::Ptr& sourceAction, const MergeAction::Ptr& targetAction) :
+    ConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingEntity, const IMergeAction::Ptr& sourceAction, const IMergeAction::Ptr& targetAction) :
         MergeAction(ActionType::ConflictResolution),
         _conflictType(conflictType),
         _conflictingEntity(conflictingEntity),