Integrating github/staging through commit ab87ed9

Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.h

@@ -103,6 +103,14 @@ namespace AzNetworking
         //! @return the connection identifier for this connection instance
         ConnectionId GetConnectionId() const;
 
+        //! Sets connection user data to the provided value.
+        //! @param userData the user data value to bind to this connection
+        void SetUserData(void* userData);
+
+        //! Retrieves the connection user data bound to this instance.
+        //! @return the connection user data bound to this instance
+        void* GetUserData() const;
+
         //! Sets the remote address for this connection instance.
         //! @param address the remote address to use for this connection instance
         void SetRemoteAddress(const IpAddress& address);
@@ -122,9 +130,10 @@ namespace AzNetworking
     private:
 
         // The following data members are here in the interface for performance reasons
-        ConnectionId      m_connectionId;
+        ConnectionId      m_connectionId = InvalidConnectionId;
         IpAddress         m_remoteAddress;
         ConnectionMetrics m_connectionMetrics;
+        void*             m_userData = nullptr;
     };
 }
 

Code/Framework/AzNetworking/AzNetworking/ConnectionLayer/IConnection.inl

@@ -34,6 +34,16 @@ namespace AzNetworking
         return m_connectionId;
     }
 
+    inline void IConnection::SetUserData(void* userData)
+    {
+        m_userData = userData;
+    }
+
+    inline void* IConnection::GetUserData() const
+    {
+        return m_userData;
+    }
+
     inline void IConnection::SetRemoteAddress(const IpAddress& address)
     {
         m_remoteAddress = address;

Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitsetView.h

@@ -33,21 +33,21 @@ namespace AzNetworking
         //! Sets the specified bit to the provided value.
         //! @param index index of the bit to set
         //! @param value value to set the bit to
-        virtual void SetBit(uint32_t index, bool value) override;
+        void SetBit(uint32_t index, bool value) override;
 
         //! Gets the current value of the specified bit.
         //! @param index index of the bit to retrieve the value of
         //! @return boolean true if the bit is set, false otherwise
-        virtual bool GetBit(uint32_t index) const override;
+        bool GetBit(uint32_t index) const override;
 
         //! Gets the current value of the specified bit.
         //! @param index index of the bit to retrieve the value of
         //! @return boolean true if the bit is set, false otherwise
-        virtual bool AnySet() const override;
+        bool AnySet() const override;
 
         //! Returns the number of bits that are represented in this fixed size bitset.
         //! @return the number of bits that are represented in this fixed size bitset
-        virtual uint32_t GetValidBitCount() const override;
+        uint32_t GetValidBitCount() const override;
 
     private: