From c49088846f45c9fb5bf36c0aaf6357bab7e47a58 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 8 Sep 2015 08:26:14 -0700
Subject: [PATCH] add an alias for AvatarDataSequenceNumber

---
 assignment-client/src/avatars/AvatarMixer.cpp | 4 ++--
 libraries/avatars/src/AvatarData.cpp          | 2 +-
 libraries/avatars/src/AvatarData.h            | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 6a0a955a6f..195bd53a97 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -259,8 +259,8 @@ void AvatarMixer::broadcastAvatarData() {
                         return;
                     }
 
-                    uint16_t lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID());
-                    uint16_t lastSeqFromSender = otherNodeData->getLastReceivedSequenceNumber();
+                    AvatarDataSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID());
+                    AvatarDataSequenceNumber lastSeqFromSender = otherNodeData->getLastReceivedSequenceNumber();
 
                     if (lastSeqToReceiver > lastSeqFromSender) {
                         // Did we somehow get out of order packets from the sender?
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 1091b299b9..9430c73091 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1098,7 +1098,7 @@ void AvatarData::sendAvatarDataPacket() {
     QByteArray avatarByteArray = toByteArray(true, sendFullUpdate);
     doneEncoding(true);
 
-    static uint16_t sequenceNumber = 0;
+    static AvatarDataSequenceNumber sequenceNumber = 0;
     
     auto avatarPacket = NLPacket::create(PacketType::AvatarData, avatarByteArray.size() + sizeof(sequenceNumber));
     avatarPacket->writePrimitive(sequenceNumber++);
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index af97180cbd..19f3081255 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -59,9 +59,11 @@ typedef unsigned long long quint64;
 #include "Recorder.h"
 #include "Referential.h"
 
-typedef std::shared_ptr<AvatarData> AvatarSharedPointer;
-typedef std::weak_ptr<AvatarData> AvatarWeakPointer;
-typedef QHash<QUuid, AvatarSharedPointer> AvatarHash;
+using AvatarSharedPointer = std::shared_ptr<AvatarData>;
+using AvatarWeakPointer = std::weak_ptr<AvatarData>;
+using AvatarHash = QHash<QUuid, AvatarSharedPointer>;
+
+using AvatarDataSequenceNumber = uint16_t;
 
 // avatar motion behaviors
 const quint32 AVATAR_MOTION_KEYBOARD_MOTOR_ENABLED = 1U << 0;