Swiftdiff options
| author | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-07-16 12:14:05 (GMT) |
|---|---|---|
| committer | Mateusz Piekos <mateuszpiekos@gmail.com> | 2012-07-16 12:14:05 (GMT) |
| commit | b2e11d7f32db65a6be001dfdf74b74f16f4c9ec3 (patch) | |
| tree | e99331d9c20e8199fda582e5f1b603d01b368f2a /Swiften/Whiteboard/WhiteboardServer.cpp | |
| parent | 0ba890e7e8c7e09c1257a7c3b1018f396e6896d1 (diff) | |
| download | swift-contrib-b2e11d7f32db65a6be001dfdf74b74f16f4c9ec3.zip swift-contrib-b2e11d7f32db65a6be001dfdf74b74f16f4c9ec3.tar.bz2 | |
Extended classes handling synchronization with update operation
Diffstat (limited to 'Swiften/Whiteboard/WhiteboardServer.cpp')
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardServer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Whiteboard/WhiteboardServer.cpp b/Swiften/Whiteboard/WhiteboardServer.cpp index 36dea87..e84ddb3 100644 --- a/Swiften/Whiteboard/WhiteboardServer.cpp +++ b/Swiften/Whiteboard/WhiteboardServer.cpp @@ -12,7 +12,7 @@ namespace Swift { operations_.push_back(operation); } - WhiteboardOperation::ref WhiteboardServer::handleClientOperationReceived(WhiteboardInsertOperation::ref newOperation) { + WhiteboardOperation::ref WhiteboardServer::handleClientOperationReceived(WhiteboardOperation::ref newOperation) { std::list<WhiteboardOperation::ref>::reverse_iterator it; if (operations_.size() == 0 || newOperation->getParentID() == operations_.back()->getID()) { operations_.push_back(newOperation); @@ -21,9 +21,9 @@ namespace Swift { for (it = operations_.rbegin(); it != operations_.rend(); ++it) { WhiteboardOperation::ref operation = *it; while (newOperation->getParentID() == operation->getParentID()) { - WhiteboardInsertOperation::ref insertOperation = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation); - if (insertOperation) { - std::pair<WhiteboardInsertOperation::ref, WhiteboardInsertOperation::ref> tResult = WhiteboardTransformer::transform(newOperation, insertOperation); +// WhiteboardInsertOperation::ref insertOperation = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation); +// if (insertOperation) { + std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> tResult = WhiteboardTransformer::transform(newOperation, operation); if (it == operations_.rbegin()) { operations_.push_back(tResult.second); @@ -33,10 +33,10 @@ namespace Swift { --it; operation = *it; } - } else { - operations_.push_back(operation); - return *it; - } +// } else { +// operations_.push_back(operation); +// return *it; +// } } } return WhiteboardOperation::ref(); |