From c0d9a3c423b61747656842a931f9c127dceba8d7 Mon Sep 17 00:00:00 2001
From: karlberg <karlberg@amazon.com>
Date: Wed, 12 May 2021 20:55:03 -0700
Subject: [PATCH] Fix for clang not being lazy about template expansion

---
 Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h | 5 -----
 Gems/Multiplayer/Code/Include/Multiplayer/INetworkTime.h | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
index eda5b71b52..4931fb167f 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/IMultiplayer.h
@@ -137,11 +137,6 @@ namespace Multiplayer
         return AZ::Interface<IMultiplayer>::Get();
     }
 
-    inline INetworkTime* GetNetworkTime()
-    {
-        return AZ::Interface<INetworkTime>::Get();
-    }
-
     inline INetworkEntityManager* GetNetworkEntityManager()
     {
         IMultiplayer* multiplayer = GetMultiplayer();
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/INetworkTime.h b/Gems/Multiplayer/Code/Include/Multiplayer/INetworkTime.h
index c228e135ee..240eed270a 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/INetworkTime.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/INetworkTime.h
@@ -83,4 +83,10 @@ namespace Multiplayer
         static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
     };
     using INetworkTimeRequestBus = AZ::EBus<INetworkTime, INetworkTimeRequests>;
+
+    // Convenience helpers
+    inline INetworkTime* GetNetworkTime()
+    {
+        return AZ::Interface<INetworkTime>::Get();
+    }
 }