diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-22 09:40:47 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-22 09:40:47 +0000 |
| commit | 27f9faf7e60ddbd858e08d26f371fe3dfd908dcf (patch) | |
| tree | 5fd0ee015af225adc36a11c06cf483398a47fa35 /Source/Core | |
| parent | f8620fcd0b4dcc6006a6a228cd5cc79cc82a83fc (diff) | |
Fix gcc build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7393 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/GameListCtrl.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/VideoConfig.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index e6da681b45..e311135a95 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -21,6 +21,7 @@ #include <wx/fontmap.h> #include <algorithm> +#include <memory> #include "FileSearch.h" #include "StringUtil.h" diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index d88e20a836..2c147a0ecb 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -118,7 +118,7 @@ void VideoConfig::Load(const char *main_ini_file, bool filecheck_passed, const c iniFile.Get("Hardware", "Adapter", &iAdapter, 0); if (iAdapter == -1) iAdapter = 0; - SET_STATE(true, iAdapter); + SET_STATE((void)true, iAdapter); // Load common settings iniFile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); |