Merge branch 'cpp11'

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

View File

@ -552,6 +552,7 @@ option(UNITTESTS "Build unitests" OFF)
######################################## ########################################
# Start compiling our code # Start compiling our code
# #
add_definitions(-std=c++0x)
add_subdirectory(Source) add_subdirectory(Source)

View File

@ -459,7 +459,11 @@ bool IniFile::Save(const char* filename)
return false; 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; const Section& section = *iter;

View File

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

View File

@ -263,7 +263,7 @@ bool AVIDump::CreateFile()
s_Stream->codec->bit_rate = 400000; s_Stream->codec->bit_rate = 400000;
s_Stream->codec->width = s_width; s_Stream->codec->width = s_width;
s_Stream->codec->height = s_height; s_Stream->codec->height = s_height;
s_Stream->codec->time_base = (AVRational){1, VideoInterface::TargetRefreshRate}; s_Stream->codec->time_base = (AVRational){1, static_cast<int>(VideoInterface::TargetRefreshRate)};
s_Stream->codec->gop_size = 12; s_Stream->codec->gop_size = 12;
s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P;

View File

@ -61,7 +61,7 @@ void BPReload()
// Cases in which we DON'T want to reload the BP // Cases in which we DON'T want to reload the BP
continue; continue;
default: default:
BPCmd bp = {i, 0xFFFFFF, ((u32*)&bpmem)[i]}; BPCmd bp = {i, 0xFFFFFF, static_cast<int>(((u32*)&bpmem)[i])};
BPWritten(bp); BPWritten(bp);
} }
} }