From 7e756c7cb50b8e7d38ddd8cba3d5dd0b544b9cf8 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian.e.gross@gmail.com>
Date: Fri, 22 Sep 2017 20:23:42 +0100
Subject: [PATCH] Small clean-up with fixes for few warnings.

---
 Source/ImGui/Private/ImGuiInputState.cpp       | 2 ++
 Source/ImGui/Private/ImGuiInteroperability.cpp | 2 +-
 Source/ImGui/Private/ImGuiInteroperability.h   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Source/ImGui/Private/ImGuiInputState.cpp b/Source/ImGui/Private/ImGuiInputState.cpp
index b15dd43..c796d0b 100644
--- a/Source/ImGui/Private/ImGuiInputState.cpp
+++ b/Source/ImGui/Private/ImGuiInputState.cpp
@@ -4,6 +4,8 @@
 
 #include "ImGuiInputState.h"
 
+#include <algorithm>
+
 
 FImGuiInputState::FImGuiInputState()
 {
diff --git a/Source/ImGui/Private/ImGuiInteroperability.cpp b/Source/ImGui/Private/ImGuiInteroperability.cpp
index 1ba8e1a..940e769 100644
--- a/Source/ImGui/Private/ImGuiInteroperability.cpp
+++ b/Source/ImGui/Private/ImGuiInteroperability.cpp
@@ -25,7 +25,7 @@ namespace
 
 	// Copy subrange of source array to destination array of the same size.
 	template<typename TArray, typename SizeType>
-	void Copy(const TArray& Src, TArray& Dst, const Utilities::TArrayIndexRange<typename TArray, typename SizeType>& Range)
+	void Copy(const TArray& Src, TArray& Dst, const Utilities::TArrayIndexRange<TArray, SizeType>& Range)
 	{
 		using std::copy;
 		using std::begin;
diff --git a/Source/ImGui/Private/ImGuiInteroperability.h b/Source/ImGui/Private/ImGuiInteroperability.h
index ccc896b..c7657aa 100644
--- a/Source/ImGui/Private/ImGuiInteroperability.h
+++ b/Source/ImGui/Private/ImGuiInteroperability.h
@@ -65,8 +65,8 @@ namespace ImGuiInterops
 	FORCEINLINE FColor UnpackImU32Color(ImU32 Color)
 	{
 		// We use IM_COL32_R/G/B/A_SHIFT macros to support different ImGui configurations.
-		return FColor{ ((Color >> IM_COL32_R_SHIFT) & 0xFF), ((Color >> IM_COL32_G_SHIFT) & 0xFF),
-			((Color >> IM_COL32_B_SHIFT) & 0xFF), ((Color >> IM_COL32_A_SHIFT) & 0xFF) };
+		return FColor{ (uint8)((Color >> IM_COL32_R_SHIFT) & 0xFF), (uint8)((Color >> IM_COL32_G_SHIFT) & 0xFF),
+			(uint8)((Color >> IM_COL32_B_SHIFT) & 0xFF), (uint8)((Color >> IM_COL32_A_SHIFT) & 0xFF) };
 	}
 
 	// Convert from ImVec4 rectangle to FSlateRect.