mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-11 11:33:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix goalc crash and clang warnings (#1441)

Browse Source
This commit is contained in:
water111
2022-06-11 16:52:27 -04:00
committed by GitHub
parent 7c5c7003b3
commit 7bf19759d3
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third-party/imgui/imgui_stdlib.cpp
Generated Vendored
+6 -6
View File
@@ -22,7 +22,7 @@ static int InputTextCallback(ImGuiInputTextCallbackData* data) {
std::string* str = user_data->Str;
IM_ASSERT(data->Buf == str->c_str());
str->resize(data->BufTextLen);
data->Buf = (char*)str->c_str();
data->Buf = str->data();
} else if (user_data->ChainCallback) {
// Forward to user callback, if any
data->UserData = user_data->ChainCallbackUserData;
@@ -43,7 +43,7 @@ bool ImGui::InputText(const char* label,
cb_user_data.Str = str;
cb_user_data.ChainCallback = callback;
cb_user_data.ChainCallbackUserData = user_data;
return InputText(label, (char*)str->c_str(), str->capacity() + 1, flags, InputTextCallback,
return InputText(label, str->data(), str->capacity() + 1, flags, InputTextCallback,
&cb_user_data);
}
@@ -60,8 +60,8 @@ bool ImGui::InputTextMultiline(const char* label,
cb_user_data.Str = str;
cb_user_data.ChainCallback = callback;
cb_user_data.ChainCallbackUserData = user_data;
return InputTextMultiline(label, (char*)str->c_str(), str->capacity() + 1, size, flags,
InputTextCallback, &cb_user_data);
return InputTextMultiline(label, str->data(), str->capacity() + 1, size, flags, InputTextCallback,
&cb_user_data);
}
bool ImGui::InputTextWithHint(const char* label,
@@ -77,6 +77,6 @@ bool ImGui::InputTextWithHint(const char* label,
cb_user_data.Str = str;
cb_user_data.ChainCallback = callback;
cb_user_data.ChainCallbackUserData = user_data;
return InputTextWithHint(label, hint, (char*)str->c_str(), str->capacity() + 1, flags,
InputTextCallback, &cb_user_data);
return InputTextWithHint(label, hint, str->data(), str->capacity() + 1, flags, InputTextCallback,
&cb_user_data);
}