Small clean-up with fixes for few warnings.

This commit is contained in:
Sebastian 2017-09-22 20:23:42 +01:00
parent 9c62196cbb
commit 7e756c7cb5
3 changed files with 5 additions and 3 deletions

View File

@ -4,6 +4,8 @@
#include "ImGuiInputState.h" #include "ImGuiInputState.h"
#include <algorithm>
FImGuiInputState::FImGuiInputState() FImGuiInputState::FImGuiInputState()
{ {

View File

@ -25,7 +25,7 @@ namespace
// Copy subrange of source array to destination array of the same size. // Copy subrange of source array to destination array of the same size.
template<typename TArray, typename SizeType> 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::copy;
using std::begin; using std::begin;

View File

@ -65,8 +65,8 @@ namespace ImGuiInterops
FORCEINLINE FColor UnpackImU32Color(ImU32 Color) FORCEINLINE FColor UnpackImU32Color(ImU32 Color)
{ {
// We use IM_COL32_R/G/B/A_SHIFT macros to support different ImGui configurations. // 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), return FColor{ (uint8)((Color >> IM_COL32_R_SHIFT) & 0xFF), (uint8)((Color >> IM_COL32_G_SHIFT) & 0xFF),
((Color >> IM_COL32_B_SHIFT) & 0xFF), ((Color >> IM_COL32_A_SHIFT) & 0xFF) }; (uint8)((Color >> IM_COL32_B_SHIFT) & 0xFF), (uint8)((Color >> IM_COL32_A_SHIFT) & 0xFF) };
} }
// Convert from ImVec4 rectangle to FSlateRect. // Convert from ImVec4 rectangle to FSlateRect.