summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Whiteboard/WhiteboardServer.cpp')
-rw-r--r--Swiften/Whiteboard/WhiteboardServer.cpp16
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();