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

Cleanup warnings of -Wunused-[const]-variable #8692

Merged
merged 2 commits into from
Mar 23, 2020
Merged

Cleanup warnings of -Wunused-[const]-variable #8692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c7a41e
Cleanup warnings of -Wunused-variable
howard0su Mar 23, 2020
500820b
Cleanup warnings of -Wunused-const-variable
howard0su Mar 23, 2020
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
2 changes: 1 addition & 1 deletion Source/Core/Common/GL/GLContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ std::unique_ptr<GLContext> GLContext::Create(const WindowSystemInfo& wsi, bool s
#if HAVE_X11
if (wsi.type == WindowSystemType::X11)
{
#if defined(HAVE_EGL)
// GLES 3 is not supported via GLX.
const bool use_egl = prefer_egl || prefer_gles;
#if defined(HAVE_EGL)
if (use_egl)
context = std::make_unique<GLContextEGLX11>();
else
Expand Down
1 change: 0 additions & 1 deletion Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "Core/Core.h"
#include "Core/NetPlayProto.h"

const int NO_INDEX = -1;
static const char* MC_HDR = "MC_SYSTEM_AREA";

bool GCMemcardDirectory::LoadGCI(GCIFile gci)
Expand Down
4 changes: 1 addition & 3 deletions Source/Core/DolphinQt/GCMemcardManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ void GCMemcardManager::UpdateSlotTable(int slot)
auto* icon = new QTableWidgetItem;
icon->setData(Qt::DecorationRole, icon_data.m_frames[0]);

std::optional<DEntry> entry = memcard->GetDEntry(file_index);

m_slot_active_icons[slot].emplace_back(std::move(icon_data));

table->setItem(i, 0, banner);
Expand Down Expand Up @@ -531,7 +529,7 @@ GCMemcardManager::IconAnimationData GCMemcardManager::GetIconFromSaveFile(int fi
if (decoded_data && !decoded_data->empty())
{
frame_data.m_frames.reserve(decoded_data->size());
const u32 per_frame_offset = MEMORY_CARD_ICON_WIDTH * MEMORY_CARD_ICON_HEIGHT;

for (size_t f = 0; f < decoded_data->size(); ++f)
{
QImage img(reinterpret_cast<const u8*>((*decoded_data)[f].image_data.data()),
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/UICommon/AutoUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ const char UPDATER_RELOC_FILENAME[] = ".Dolphin Updater.2.app";

#endif

#ifdef OS_SUPPORTS_UPDATER
const char UPDATER_LOG_FILE[] = "Updater.log";

#ifdef OS_SUPPORTS_UPDATER
std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& flags)
{
#ifdef __APPLE__
Expand Down