Merge branch 'MultiplayerCompileFix' into Atom/moudgils/BumpResourcePoolBuilder

2021-04-15 22:11:39 -07:00
parent ca86068d83 ee3f157fb8
commit 51720e269b
2 changed files with 5 additions and 1 deletions
@@ -115,7 +115,7 @@ namespace AzNetworking

        ContainerType m_container;

-        template <AZStd::size_t, typename ElementType>
+        template <AZStd::size_t, typename>
        friend class FixedSizeVectorBitset;
    };
 }
@@ -97,6 +97,10 @@ namespace UnitTest
        m_mpComponent->OnConnect(&connMock2);

        EXPECT_EQ(m_connectionAcquiredCount, 25);
+
+        // Clean up connection data
+        m_mpComponent->OnDisconnect(&connMock1, AzNetworking::DisconnectReason::None, AzNetworking::TerminationEndpoint::Local);
+        m_mpComponent->OnDisconnect(&connMock2, AzNetworking::DisconnectReason::None, AzNetworking::TerminationEndpoint::Local);
    }
 }