diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2011-04-11 13:08:27 +0200 |
---|---|---|
committer | Patrick Ohly <patrick.ohly@intel.com> | 2011-04-11 13:08:27 +0200 |
commit | 487d78832ca43879902dd0a119fcc2015c50e88c (patch) | |
tree | a4163adefc222a398f21b7e19f9b571e9e101854 | |
parent | 3e6ac628e274b535650a6ae4577cbca8940ad773 (diff) |
BinFileImplDS: apiEndDataWrite() ambiguous
clang 2.9 pointed out that apiEndDataWrite() existed in versions
with and without parameter. Unified that to the version with
a string retval.
Probably never mattered because all implementations are empty?!
-rwxr-xr-x | src/sysync/binfileimplds.cpp | 3 | ||||
-rwxr-xr-x | src/sysync/binfileimplds.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sysync/binfileimplds.cpp b/src/sysync/binfileimplds.cpp index 7871eab..3b271ab 100755 --- a/src/sysync/binfileimplds.cpp +++ b/src/sysync/binfileimplds.cpp @@ -2228,7 +2228,8 @@ bool TBinfileImplDS::implEndDataWrite(void) // Note that in BASED_ON_BINFILE_CLIENT case, implEndDataWrite() is // derived by customimplds and will call the other apiEndDataWrite(cmpRef) // variant, and then call this inherited method. - return apiEndDataWrite()!=LOCERR_OK; + string thisSyncIdentifier; + return apiEndDataWrite(thisSyncIdentifier)!=LOCERR_OK; } // TBinfileImplDS::implEndDataWrite diff --git a/src/sysync/binfileimplds.h b/src/sysync/binfileimplds.h index d776323..5339a36 100755 --- a/src/sysync/binfileimplds.h +++ b/src/sysync/binfileimplds.h @@ -903,7 +903,7 @@ protected: /// signal start of data write phase virtual localstatus apiStartDataWrite(void) { return LOCERR_OK; }; /// signal end of data write phase - virtual localstatus apiEndDataWrite(void) { return LOCERR_OK; }; + virtual localstatus apiEndDataWrite(string &aThisSyncIdentifier) { return LOCERR_OK; }; /// update item by local ID in the sync set. Caller retains ownership of aItemP /// @return != LOCERR_OK if item with specified ID is not found. virtual localstatus updateItemByID(localid_t aLocalID, TSyncItem *aItemP) = 0; |