From 0c0cb6d69c79a5d06498a1b10595587f029bdeb1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sat, 12 Nov 2016 15:36:36 +0100
Subject: [PATCH] - fixed warnings.
---
src/c_console.cpp | 12 ++++++------
src/zstring.cpp | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/c_console.cpp b/src/c_console.cpp
index 7cde25c57..3064abb0d 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -282,7 +282,7 @@ struct FCommandBuffer
void CursorEnd()
{
- CursorPos = Text.Len();
+ CursorPos = (unsigned)Text.Len();
StartPos = 0;
MakeStartPosGood();
}
@@ -358,7 +358,7 @@ struct FCommandBuffer
{
Text.Insert(CursorPos, clip);
}
- CursorPos += clip.Len();
+ CursorPos += (unsigned)clip.Len();
MakeStartPosGood();
}
}
@@ -366,7 +366,7 @@ struct FCommandBuffer
void SetString(FString str)
{
Text = str;
- CursorPos = Text.Len();
+ CursorPos = (unsigned)Text.Len();
MakeStartPosGood();
}
};
@@ -1862,7 +1862,7 @@ static void C_TabComplete (bool goForward)
}
TabStart = i;
- TabSize = CmdLine.Text.Len() - TabStart;
+ TabSize = (int)CmdLine.Text.Len() - TabStart;
if (!FindTabCommand(&CmdLine.Text[TabStart], &TabPos, TabSize))
return; // No initial matches
@@ -1922,7 +1922,7 @@ static void C_TabComplete (bool goForward)
CmdLine.Text << TabCommands[TabPos].TabName << ' ';
}
}
- CmdLine.CursorPos = CmdLine.Text.Len();
+ CmdLine.CursorPos = (unsigned)CmdLine.Text.Len();
CmdLine.MakeStartPosGood();
}
@@ -1996,7 +1996,7 @@ static bool C_TabCompleteList ()
TabSize = commonsize;
CmdLine.Text.Truncate(TabStart);
CmdLine.Text.AppendCStrPart(TabCommands[TabPos].TabName.GetChars(), commonsize);
- CmdLine.CursorPos = CmdLine.Text.Len();
+ CmdLine.CursorPos = (unsigned)CmdLine.Text.Len();
}
return false;
}
diff --git a/src/zstring.cpp b/src/zstring.cpp
index 29270b970..b6e5b4b8d 100644
--- a/src/zstring.cpp
+++ b/src/zstring.cpp
@@ -397,7 +397,7 @@ void FString::Remove(size_t index, size_t remlen)
if (Data()->RefCount == 1)
{ // Can do this in place
memmove(Chars + index, Chars + index + remlen, Len() - index - remlen);
- Data()->Len -= remlen;
+ Data()->Len -= (unsigned)remlen;
}
else
{ // Must do it in a copy