diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2011-08-29 16:56:24 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2011-09-15 12:26:32 +0200 |
| commit | dbe317de4339bb449834b445e8334d066304dbce (patch) | |
| tree | c1451cfebaa15cbbc5a5dc5138b5d7b8f4979356 | |
| parent | 78cb017054fddb18544010de5c419e56c21d509e (diff) | |
dataconversion.cpp: added dummy getConflictingItemByLocalID() to resolve compile problem
After the recent change ("server engine: better support for backend
doing its own duplicate merging (status 207 from API)"),
dataconversion.cpp no longer compiled because the dummy engine didn't
implement the new pure virtual getConflictingItemByLocalID().
| -rw-r--r-- | src/sysync/dataconversion.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sysync/dataconversion.cpp b/src/sysync/dataconversion.cpp index 421bf90..5b51210 100644 --- a/src/sysync/dataconversion.cpp +++ b/src/sysync/dataconversion.cpp @@ -32,6 +32,7 @@ public: virtual void logicMarkItemForResend(const char*, const char*) {} #ifdef SYSYNC_SERVER virtual TSyncItem *getConflictingItemByRemoteID(TSyncItem *syncitemP) { return NULL; } + virtual TSyncItem *getConflictingItemByLocalID(TSyncItem *syncitemP) { return NULL; } virtual TSyncItem *getMatchingItem(TSyncItem *syncitemP, TEqualityMode aEqMode) { return NULL; } virtual void dontSendItemAsServer(TSyncItem *syncitemP) {} virtual void SendItemAsServer(TSyncItem *aSyncitemP) {} |