History

Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message

Ryan Huffman committed 10 years ago

Commit dac491e2 parents 07d2151 7627097144 files · +4746 −1636Browse files

Showing the changes to assignment-client/src/AssignmentClientMonitor.cpp (1 of 144 files). Show all

Unified · Split

assignment-client/src/AssignmentClientMonitor.cpp+4−2
@@ -9,6 +9,7 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include <memory>
12#include <signal.h>13#include <signal.h>
13 14
14#include <AddressManager.h>15#include <AddressManager.h>
@@ -227,8 +228,9 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<ReceivedMes · 212 unmodified lines
227 matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode228 matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode
228 (senderID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false);229 (senderID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false);
229 230
230 childData = new AssignmentClientChildData(Assignment::Type::AllTypes);231 auto childData = std::unique_ptr<AssignmentClientChildData>
231 matchingNode->setLinkedData(childData);232 { new AssignmentClientChildData(Assignment::Type::AllTypes) };
233 matchingNode->setLinkedData(std::move(childData));
232 } else {234 } else {
233 // tell unknown assignment-client child to exit.235 // tell unknown assignment-client child to exit.
234 qDebug() << "Asking unknown child at" << senderSockAddr << "to exit.";236 qDebug() << "Asking unknown child at" << senderSockAddr << "to exit.";