fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing most remaining C++ warnings in clang.

Browse Source
This commit is contained in:
Ben Vanik
2016-01-01 18:37:33 +00:00
parent e029c9abdc
commit b02ca62388
11 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/kernel/xam/xam_content.cc
View File

@@ -182,7 +182,9 @@ dword_result_t XamContentCreateEnumerator(dword_t user_index, dword_t device_id,
// Get all content data.
auto content_datas = kernel_state()->content_manager()->ListContent(
device_id ? device_id : dummy_device_info_.device_id, content_type);
device_id ? static_cast<uint32_t>(device_id)
: dummy_device_info_.device_id,
content_type);
for (auto& content_data : content_datas) {
auto ptr = e->AppendItem();
if (!ptr) {

6
src/xenia/kernel/xam/xam_ui.cc
View File

@@ -21,7 +21,7 @@ namespace xe {
namespace kernel {
namespace xam {
std::atomic<int> xam_dialogs_shown_ = 0;
std::atomic<int> xam_dialogs_shown_ = {0};
SHIM_CALL XamIsUIActive_shim(PPCContext* ppc_context,
KernelState* kernel_state) {
@@ -54,7 +54,7 @@ class MessageBoxDialog : public xe::ui::ImGuiDialog {
}
if (ImGui::BeginPopupModal(title_.c_str(), nullptr,
ImGuiWindowFlags_AlwaysAutoResize)) {
ImGui::Text(description_.c_str());
ImGui::Text("%s", description_.c_str());
if (first_draw) {
ImGui::SetKeyboardFocusHere();
}
@@ -185,7 +185,7 @@ class KeyboardInputDialog : public xe::ui::ImGuiDialog {
}
if (ImGui::BeginPopupModal(title_.c_str(), nullptr,
ImGuiWindowFlags_AlwaysAutoResize)) {
ImGui::TextWrapped(description_.c_str());
ImGui::TextWrapped("%s", description_.c_str());
if (first_draw) {
ImGui::SetKeyboardFocusHere();
}