fix LoadStoreAlignment error

Author: bertmelis

src/AsyncMqttClient/Packets/Out/OutPacket.cpp

@@ -6,7 +6,8 @@ OutPacket::OutPacket()
 : next(nullptr)
 , timeout(0)
 , noTries(0)
-, _released(true) {}
+, _released(true)
+, _packetId(0) {}
 
 OutPacket::~OutPacket() {}
 
@@ -19,7 +20,7 @@ uint8_t OutPacket::packetType() const {
 }
 
 uint16_t OutPacket::packetId() const {
- return 0;
+ return _packetId;
 }
 
 uint8_t OutPacket::qos() const {
@@ -33,11 +34,11 @@ void OutPacket::release() {
  _released = true;
 }
 
-uint16_t OutPacket::_packetId = 0;
+uint16_t OutPacket::_nextPacketId = 0;
 
 uint16_t OutPacket::_getNextPacketId() {
- if (++_packetId == 0) {
- ++_packetId;
+ if (++_nextPacketId == 0) {
+ ++_nextPacketId;
  }
- return _packetId;
+ return _nextPacketId;
 }

src/AsyncMqttClient/Packets/Out/OutPacket.hpp

@@ -15,7 +15,7 @@ class OutPacket {
  virtual size_t size() const = 0;
  virtual bool released() const;
  uint8_t packetType() const;
- virtual uint16_t packetId() const;
+ uint16_t packetId() const;
  uint8_t qos() const;
  void release();
 
@@ -27,8 +27,9 @@ class OutPacket {
  protected:
  static uint16_t _getNextPacketId();
  bool _released;
+ uint16_t _packetId;
 
  private:
- static uint16_t _packetId;
+ static uint16_t _nextPacketId;
 };
 } // namespace AsyncMqttClientInternals

src/AsyncMqttClient/Packets/Out/PubAck.cpp

@@ -28,7 +28,3 @@ bool PubAckOutPacket::released() const {
  }
  return true;
 }
-
-uint16_t PubAckOutPacket::packetId() const {
- return _packetId;
-}

src/AsyncMqttClient/Packets/Out/PubAck.hpp

@@ -13,10 +13,8 @@ class PubAckOutPacket : public OutPacket {
  size_t size() const;
 
  bool released() const override;
- uint16_t packetId() const override;
 
  private:
  uint8_t _data[4];
- uint16_t _packetId;
 };
 } // namespace AsyncMqttClientInternals

src/AsyncMqttClient/Packets/Out/Publish.cpp

@@ -66,10 +66,6 @@ size_t PublishOutPacket::size() const {
  return _data.size();
 }
 
-uint16_t PublishOutPacket::packetId() const {
- return _packetId;
-}
-
 void PublishOutPacket::setDup() {
  _data[0] |= AsyncMqttClientInternals::HeaderFlag.PUBLISH_DUP;
 }

src/AsyncMqttClient/Packets/Out/Publish.hpp

@@ -14,7 +14,6 @@ class PublishOutPacket : public OutPacket {
  PublishOutPacket(const char* topic, uint8_t qos, bool retain, const char* payload, size_t length);
  const uint8_t* data(size_t index = 0) const;
  size_t size() const;
- uint16_t packetId() const override;
 
  void setDup(); // you cannot unset dup
 

src/AsyncMqttClient/Packets/Out/Subscribe.cpp

@@ -47,7 +47,3 @@ const uint8_t* SubscribeOutPacket::data(size_t index) const {
 size_t SubscribeOutPacket::size() const {
  return _data.size();
 }
-
-uint16_t SubscribeOutPacket::packetId() const {
- return _packetId;
-}

src/AsyncMqttClient/Packets/Out/Subscribe.hpp

@@ -15,8 +15,6 @@ class SubscribeOutPacket : public OutPacket {
  const uint8_t* data(size_t index = 0) const;
  size_t size() const;
 
- uint16_t packetId() const;
-
  private:
  std::vector<uint8_t> _data;
  uint16_t _packetId;

src/AsyncMqttClient/Packets/Out/Unsubscribe.cpp

@@ -40,7 +40,3 @@ const uint8_t* UnsubscribeOutPacket::data(size_t index) const {
 size_t UnsubscribeOutPacket::size() const {
  return _data.size();
 }
-
-uint16_t UnsubscribeOutPacket::packetId() const {
- return _packetId;
-}

src/AsyncMqttClient/Packets/Out/Unsubscribe.hpp

@@ -19,6 +19,5 @@ class UnsubscribeOutPacket : public OutPacket {
 
  private:
  std::vector<uint8_t> _data;
- uint16_t _packetId;
 };
 } // namespace AsyncMqttClientInternals