diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2012-02-28 00:28:13 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2012-02-28 00:28:13 -0600 |
| commit | ee09def802f9883056a2dc43136e65922dcccee2 (patch) | |
| tree | d504c21db411b5d67c046ae836e7583c23d4c2ce /Source/Core/Common | |
| parent | c3293b1a1cea3cdd9858b00c2a34d783347e72c3 (diff) | |
| parent | 38823b63716b46ec00337f20127de43661deac8b (diff) | |
Merge branch 'cpp11'
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/IniFile.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Common/Src/StdThread.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp index c81c060f1d..acad498106 100644 --- a/Source/Core/Common/Src/IniFile.cpp +++ b/Source/Core/Common/Src/IniFile.cpp @@ -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; diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h index 6e9e903561..b64dbf2c4e 100644 --- a/Source/Core/Common/Src/StdThread.h +++ b/Source/Core/Common/Src/StdThread.h @@ -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 |