OdTfFixedMergeHandler< conflictResolution > Struct Template Reference

#include <TfRevisionControl.h>

Inheritance diagram for OdTfFixedMergeHandler< conflictResolution >:

Public Member Functions
	OdTfFixedMergeHandler ()
OdTfRevisionControl::MergeResolution	operator() (const OdDbHandle &h, OdTfRevisionControl::ChangeType myChange, OdTfRevisionControl::ChangeType theirChange, OdTfRevisionControl::MergeResolution autoResolution) override
Public Member Functions inherited from OdTfMergeHandler
virtual	~OdTfMergeHandler ()

Detailed Description

template<OdTfRevisionControl::MergeResolution conflictResolution = OdTfRevisionControl::kMergeTheirsConflict>
struct OdTfFixedMergeHandler< conflictResolution >

OdTfMergeConflictHandler implementation returning a fixed conflict resolution.

Should not be used in combination with OdTfRevisionControl::kMergePostpone for it will not collect the conflicts for later resolving. See OdTfPostponeMergeConflictHandler for that.

Parameters

conflictResolution

The fixed conflict resolution.

Definition at line 338 of file TfRevisionControl.h.

Constructor & Destructor Documentation

OdTfFixedMergeHandler()

template<OdTfRevisionControl::MergeResolution conflictResolution = OdTfRevisionControl::kMergeTheirsConflict>

OdTfFixedMergeHandler< conflictResolution >::OdTfFixedMergeHandler ( )

inline

Default constructor for instances of the OdTfFixedMergeHandler structure.

Definition at line 343 of file TfRevisionControl.h.

Member Function Documentation

operator()()

template<OdTfRevisionControl::MergeResolution conflictResolution = OdTfRevisionControl::kMergeTheirsConflict>

OdTfRevisionControl::MergeResolution OdTfFixedMergeHandler< conflictResolution >::operator() ( const OdDbHandle & h, OdTfRevisionControl::ChangeType myChange, OdTfRevisionControl::ChangeType theirChange, OdTfRevisionControl::MergeResolution autoResolution )

inlineoverridevirtual

Implements OdTfMergeHandler.

Definition at line 345 of file TfRevisionControl.h.

---

The documentation for this struct was generated from the following file:

• TfRevisionControl.h