mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-23 01:38:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cpp11'

Browse source
This commit is contained in:
Jordan Woyak 2012-02-28 00:28:13 -06:00
commit ee09def802
5 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Common/Src/IniFile.cpp
View file

@ -459,7 +459,11 @@ bool IniFile::Save(const char* filename)
return false;
}
for (std::vector<Section>::const_iterator iter = sections.begin(); iter != sections.end(); ++iter)
// Currently testing if dolphin community can handle the requirements of C++11 compilation
// If you get a compiler error on this line, your compiler is probably old.
// Update to g++ 4.4 or a recent version of clang (XCode 4.2 on OS X).
// If you don't want to update, complain in a google code issue, the dolphin forums or #dolphin-emu.
for (auto iter = sections.begin(); iter != sections.end(); ++iter)
{
const Section& section = *iter;

2
Source/Core/Common/Src/StdThread.h
View file

@ -7,7 +7,9 @@
#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__
// GCC 4.4 provides <thread>
#ifndef _GLIBCXX_USE_SCHED_YIELD
#define _GLIBCXX_USE_SCHED_YIELD
#endif
#include <thread>
#else