Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clang warning fixes #94

Merged
merged 1 commit into from
Dec 6, 2014
+4 −4
Merged

Clang warning fixes #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions imgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7188,7 +7188,7 @@ struct ExampleAppConsole
const char* commands[] = { "HELP", "CLEAR", "CLASSIFY" };
ImVector<const char*> candidates;
for (size_t i = 0; i < IM_ARRAYSIZE(commands); i++)
if (ImStrnicmp(commands[i], word_start, word_end-word_start) == 0)
if (ImStrnicmp(commands[i], word_start, (int)(word_end-word_start)) == 0)
candidates.push_back(commands[i]);

if (candidates.size() == 0)
Expand All @@ -7199,14 +7199,14 @@ struct ExampleAppConsole
else if (candidates.size() == 1)
{
// Single match. Delete the beginning of the word and replace it entirely so we've got nice casing
data->DeleteChars(word_start-data->Buf, word_end-word_start);
data->DeleteChars((int)(word_start-data->Buf), (int)(word_end-word_start));
data->InsertChars(data->CursorPos, candidates[0]);
data->InsertChars(data->CursorPos, " ");
}
else
{
// Multiple matches. Complete as much as we can, so inputing "C" will complete to "CL" and display "CLEAR" and "CLASSIFY"
int match_len = word_end - word_start;
int match_len = (int)(word_end - word_start);
while (true)
{
int c = 0;
Expand All @@ -7225,7 +7225,7 @@ struct ExampleAppConsole

if (match_len > 0)
{
data->DeleteChars(word_start - data->Buf, word_end-word_start);
data->DeleteChars((int)(word_start - data->Buf), (int)(word_end-word_start));
data->InsertChars(data->CursorPos, candidates[0], candidates[0] + match_len);
}

Expand Down