From f3d7f6db4cabdfbf356e2cf8e9c477b72c0971e9 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 28 Aug 2016 22:48:10 +0100
Subject: test

---
 src/ClientHandle.cpp  | 2 +-
 src/ClientHandle.h    | 2 +-
 src/Entities/Entity.h | 2 +-
 src/Entities/Player.h | 2 +-
 src/Globals.h         | 2 +-
 src/World.h           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index f4aa3e0c5..06f6f443e 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -414,7 +414,7 @@ void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID,
 			cRoot::Get()->BroadcastPlayerListsAddPlayer(*Player);
 			cRoot::Get()->SendPlayerLists(Player);
 
-			// Note: cEnttiy::Initialize takes ownership of the player object
+			// Note: cEntity::Initialize takes ownership of the player object
 			Player->Initialize(std::move(PlayerPtr.value), *World);
 
 			World->AddPlayer(Player);
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 44261827d..bb90db777 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -413,7 +413,7 @@ private:
 
 	struct sChunkCoordsHash
 	{
-		auto operator()(const cChunkCoords & a_ChunkCoords) const
+		size_t operator()(const cChunkCoords & a_ChunkCoords) const
 		{
 			size_t Seed = static_cast<size_t>(a_ChunkCoords.m_ChunkX) + 0x9e3779b9;
 			return (Seed ^= static_cast<size_t>(a_ChunkCoords.m_ChunkZ) + 0x9e3779b9 + (Seed << 6) + (Seed >> 2));
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 94c1e681d..a8074406c 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -301,7 +301,7 @@ public:
 	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI);
 
 	/** Returns the position stored before the last call to SetPosition. */
-	auto GetLastPosition(void) const { return m_LastPosition; }
+	Vector3d GetLastPosition(void) const { return m_LastPosition; }
 
 	// tolua_begin
 
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 988b5b326..c8e7b8297 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -235,7 +235,7 @@ public:
 	// tolua_end
 
 	/** Returns the SharedPtr to client handle associated with the player. */
-	auto GetClientHandlePtr(void) const { return m_ClientHandle; }
+	std::weak_ptr<cClientHandle> GetClientHandlePtr(void) const { return m_ClientHandle; }
 
 	// tolua_begin
 
diff --git a/src/Globals.h b/src/Globals.h
index 804b0a5ac..0ab78121c 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -482,7 +482,7 @@ namespace std
 	template <typename WeakPtrType>
 	struct equal_to<std::weak_ptr<WeakPtrType>>
 	{
-		constexpr bool operator()(const std::weak_ptr<WeakPtrType> & a_Lhs, const std::weak_ptr<WeakPtrType> & a_Rhs) const
+		/* constexpr */ bool operator()(const std::weak_ptr<WeakPtrType> & a_Lhs, const std::weak_ptr<WeakPtrType> & a_Rhs) const
 		{
 			return (!a_Lhs.owner_before(a_Rhs) && !a_Rhs.owner_before(a_Lhs));
 		}
diff --git a/src/World.h b/src/World.h
index 6d5df5c4a..de7fcac2e 100644
--- a/src/World.h
+++ b/src/World.h
@@ -649,7 +649,7 @@ public:
 
 	/** Queues a task onto the tick thread. The task object will be deleted once the task is finished */
 	template <typename FunctionType>
-	auto QueueTask(FunctionType && a_Task)  // Exported in ManualBindings.cpp
+	std::future<void> QueueTask(FunctionType && a_Task)  // Exported in ManualBindings.cpp
 	{
 		cCSLock Lock(m_CSTasks);
 		m_Tasks.emplace_back(-1, std::forward<FunctionType>(a_Task));
-- 
cgit v1.2.3