From c162d53908a008b2fc7432d8709c5be5d5b6eefb Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 8 Jul 2015 16:38:17 -0700 Subject: [PATCH] fix writes in JurisdictionMap --- libraries/octree/src/JurisdictionMap.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp index dca33287db..d6e4ad8003 100644 --- a/libraries/octree/src/JurisdictionMap.cpp +++ b/libraries/octree/src/JurisdictionMap.cpp @@ -273,9 +273,9 @@ std::unique_ptr JurisdictionMap::packEmptyJurisdictionIntoMessage(Node auto packet = NLPacket::create(PacketType::Jurisdiction, sizeof(type) + sizeof(bytes)); // Pack the Node Type in first byte - packet->write(type); + packet->writePrimitive(type); // No root or end node details to pack! - packet->write(bytes); + packet->writePrimitive(bytes); return std::move(packet); // includes header! } @@ -285,18 +285,18 @@ std::unique_ptr JurisdictionMap::packIntoMessage() { // Pack the Node Type in first byte NodeType_t type = getNodeType(); - packet->write(type); + packet->writePrimitive(type); // add the root jurisdiction if (_rootOctalCode) { size_t bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(_rootOctalCode)); // No root or end node details to pack! - packet->write(bytes); + packet->writePrimitive(bytes); packet->write(reinterpret_cast(_rootOctalCode), bytes); // if and only if there's a root jurisdiction, also include the end nodes int endNodeCount = _endNodes.size(); - packet->write(endNodeCount); + packet->writePrimitive(endNodeCount); for (int i=0; i < endNodeCount; i++) { unsigned char* endNodeCode = _endNodes[i]; @@ -304,12 +304,12 @@ std::unique_ptr JurisdictionMap::packIntoMessage() { if (endNodeCode) { bytes = bytesRequiredForCodeLength(numberOfThreeBitSectionsInCode(endNodeCode)); } - packet->write(bytes); + packet->writePrimitive(bytes); packet->write(reinterpret_cast(endNodeCode), bytes); } } else { int bytes = 0; - packet->write(bytes); + packet->writePrimitive(bytes); } return std::move(packet);