From 00ed0e2ae318a5a3ab7a57629a94058f8659e6ef Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 4 Feb 2016 12:24:44 +0100
Subject: [PATCH] Network/NetPacket: Inline some methods

Former-commit-id: d54e7b9ff1baf93f6da35e29123d598b84742eac
---
 include/Nazara/Network/NetPacket.hpp | 15 +++++-----
 include/Nazara/Network/NetPacket.inl | 42 ++++++++++++++++++++++++++++
 src/Nazara/Network/NetPacket.cpp     | 41 ---------------------------
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/include/Nazara/Network/NetPacket.hpp b/include/Nazara/Network/NetPacket.hpp
index ff69fb2db..f906a5431 100644
--- a/include/Nazara/Network/NetPacket.hpp
+++ b/include/Nazara/Network/NetPacket.hpp
@@ -13,7 +13,6 @@
 #include <Nazara/Core/Mutex.hpp>
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Network/Config.hpp>
-#include <iostream>
 
 namespace Nz
 {
@@ -22,21 +21,21 @@ namespace Nz
 		friend class Network;
 
 		public:
-			NetPacket();
-			NetPacket(UInt16 netCode, std::size_t sizeHint = 0);
-			NetPacket(UInt16 netCode, const void* ptr, std::size_t size);
+			inline NetPacket();
+			inline NetPacket(UInt16 netCode, std::size_t sizeHint = 0);
+			inline NetPacket(UInt16 netCode, const void* ptr, std::size_t size);
 			NetPacket(const NetPacket&) = delete;
 			NetPacket(NetPacket&&) = default;
-			~NetPacket();
+			inline ~NetPacket();
 
 			inline UInt16 GetNetCode() const;
 
 			virtual void OnReceive(UInt16 netCode, const void* data, std::size_t size);
 			virtual const void* OnSend(std::size_t* newSize) const;
 
-			void Reset();
-			void Reset(UInt16 netCode, std::size_t sizeHint = 0);
-			void Reset(UInt16 netCode, const void* ptr, std::size_t size);
+			inline void Reset();
+			inline void Reset(UInt16 netCode, std::size_t sizeHint = 0);
+			inline void Reset(UInt16 netCode, const void* ptr, std::size_t size);
 
 			inline void SetNetCode(UInt16 netCode);
 
diff --git a/include/Nazara/Network/NetPacket.inl b/include/Nazara/Network/NetPacket.inl
index 62675af69..f0112dc47 100644
--- a/include/Nazara/Network/NetPacket.inl
+++ b/include/Nazara/Network/NetPacket.inl
@@ -3,14 +3,56 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Debug.hpp>
+#include <Nazara/Network/Enums.hpp>
+#include <cstring>
 
 namespace Nz
 {
+	inline NetPacket::NetPacket() :
+	m_netCode(NetCode_Invalid)
+	{
+	}
+
+	inline NetPacket::NetPacket(UInt16 netCode, std::size_t sizeHint)
+	{
+		Reset(netCode, sizeHint);
+	}
+
+	inline NetPacket::NetPacket(UInt16 netCode, const void* ptr, std::size_t size)
+	{
+		Reset(netCode, ptr, size);
+	}
+
+	inline NetPacket::~NetPacket()
+	{
+		FreeStream();
+	}
+
 	inline UInt16 NetPacket::GetNetCode() const
 	{
 		return m_netCode;
 	}
 
+	inline void NetPacket::Reset()
+	{
+		FreeStream();
+	}
+
+	inline void NetPacket::Reset(UInt16 netCode, std::size_t sizeHint)
+	{
+		InitStream(HeaderSize + sizeHint, HeaderSize, OpenMode_WriteOnly);
+		m_netCode = netCode;
+	}
+
+	inline void NetPacket::Reset(UInt16 netCode, const void* ptr, std::size_t size)
+	{
+		InitStream(HeaderSize + size, HeaderSize, OpenMode_ReadOnly);
+		m_buffer->Resize(HeaderSize + size);
+		std::memcpy(m_buffer->GetBuffer() + HeaderSize, ptr, size);
+
+		m_netCode = netCode;
+	}
+
 	inline void NetPacket::SetNetCode(UInt16 netCode)
 	{
 		m_netCode = netCode;
diff --git a/src/Nazara/Network/NetPacket.cpp b/src/Nazara/Network/NetPacket.cpp
index bf3b91618..f9e305e14 100644
--- a/src/Nazara/Network/NetPacket.cpp
+++ b/src/Nazara/Network/NetPacket.cpp
@@ -5,31 +5,10 @@
 #include <Nazara/Network/NetPacket.hpp>
 #include <Nazara/Core/LockGuard.hpp>
 #include <Nazara/Core/MemoryView.hpp>
-#include <Nazara/Network/Enums.hpp>
 #include <Nazara/Network/Debug.hpp>
 
 namespace Nz
 {
-	NetPacket::NetPacket() :
-	m_netCode(NetCode_Invalid)
-	{
-	}
-
-	NetPacket::NetPacket(UInt16 netCode, std::size_t sizeHint)
-	{
-		Reset(netCode, sizeHint);
-	}
-
-	NetPacket::NetPacket(UInt16 netCode, const void* ptr, std::size_t size)
-	{
-		Reset(netCode, ptr, size);
-	}
-
-	NetPacket::~NetPacket()
-	{
-		FreeStream();
-	}
-
 	void NetPacket::OnReceive(UInt16 netCode, const void* data, std::size_t size)
 	{
 		Reset(netCode, data, size);
@@ -51,26 +30,6 @@ namespace Nz
 		return m_buffer->GetBuffer();
 	}
 
-	void NetPacket::Reset()
-	{
-		FreeStream();
-	}
-
-	void NetPacket::Reset(UInt16 netCode, std::size_t sizeHint)
-	{
-		InitStream(HeaderSize + sizeHint, HeaderSize, OpenMode_WriteOnly);
-		m_netCode = netCode;
-	}
-
-	void NetPacket::Reset(UInt16 netCode, const void* ptr, std::size_t size)
-	{
-		InitStream(HeaderSize + size, HeaderSize, OpenMode_ReadOnly);
-		m_buffer->Resize(HeaderSize + size);
-		std::memcpy(m_buffer->GetBuffer() + HeaderSize, ptr, size);
-
-		m_netCode = netCode;
-	}
-
 	bool NetPacket::DecodeHeader(const void* data, UInt16* packetSize, UInt16* netCode)
 	{
 		MemoryView stream(data, HeaderSize);