This change might work better if I git add the files

Source/Core/AudioCommon/Src/Mixer.h

@@ -18,8 +18,9 @@
 #ifndef _MIXER_H_
 #define _MIXER_H_
 
+#include <mutex>
+
 #include "WaveFile.h"
-#include "StdMutex.h"
 
 // 16 bit Stereo
 #define MAX_SAMPLES			(1024 * 8)

Source/Core/Common/Common.vcxproj

@@ -241,9 +241,6 @@
     <ClInclude Include="Src\SDCardUtil.h" />
     <ClInclude Include="Src\Setup.h" />
     <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\StdConditionVariable.h" />
-    <ClInclude Include="Src\StdMutex.h" />
-    <ClInclude Include="Src\StdThread.h" />
     <ClInclude Include="Src\StringUtil.h" />
     <ClInclude Include="Src\SymbolDB.h" />
     <ClInclude Include="Src\SysConf.h" />
@@ -261,4 +258,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/Common/Common.vcxproj.filters

@@ -85,7 +85,6 @@
     <ClInclude Include="Src\SDCardUtil.h" />
     <ClInclude Include="Src\Setup.h" />
     <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\StdThread.h" />
     <ClInclude Include="Src\StringUtil.h" />
     <ClInclude Include="Src\SymbolDB.h" />
     <ClInclude Include="Src\SysConf.h" />
@@ -119,8 +118,6 @@
     <ClInclude Include="Src\Crypto\tools.h">
       <Filter>Crypto</Filter>
     </ClInclude>
-    <ClInclude Include="Src\StdMutex.h" />
-    <ClInclude Include="Src\StdConditionVariable.h" />
     <ClInclude Include="Src\x64ABI.h" />
   </ItemGroup>
   <ItemGroup>
@@ -134,4 +131,4 @@
       <UniqueIdentifier>{f078f36e-a0ff-4cd0-95f8-476100d68e68}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

Source/Core/Common/Src/LogManager.h

@@ -46,7 +46,7 @@ public:
 
 	void Log(LogTypes::LOG_LEVELS, const char *msg);
 
-	bool IsValid() { return (m_logfile != NULL); }
+	bool IsValid() { return (bool)m_logfile; }
 	bool IsEnabled() const { return m_enable; }
 	void SetEnable(bool enable) { m_enable = enable; }
 

Source/Core/Common/Src/Thread.h

@@ -18,9 +18,16 @@
 #ifndef _THREAD_H_
 #define _THREAD_H_
 
-#include "StdThread.h"
-#include "StdMutex.h"
-#include "StdConditionVariable.h"
+// <condition_variable> has a bug in some versions of libc++: it uses _ as a variable.
+// This conflicts with gettext's use of _ as a macro.
+#undef _
+
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+
+// Restore _
+#define _(s) wxGetTranslation((s))
 
 // Don't include common.h here as it will break LogManager
 #include "CommonTypes.h"

Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h

@@ -75,7 +75,7 @@ public:
 	virtual void DoState(PointerWrap& p);
 
 	// Needed because StdThread.h std::thread implem does not support member
-	// pointers.
+	// pointers. TODO(delroth): obsolete.
 	static void SpawnAXThread(CUCode_AX* self);
 
 protected:

Source/Core/Core/Src/HW/EXI_DeviceMic.h

@@ -20,7 +20,7 @@
 
 #if HAVE_PORTAUDIO
 
-#include "StdMutex.h"
+#include <mutex>
 
 class CEXIMic : public IEXIDevice
 {

Source/Core/DolphinWX/Src/ConfigMain.cpp

@@ -18,6 +18,7 @@
 #include <string> // System
 #include <vector>
 #include <algorithm>
+#include <functional>
 #include <wx/spinbutt.h>
 
 #include "Common.h"
@@ -43,14 +44,6 @@
 #include "Main.h"
 #include "VideoBackendBase.h"
 
-#if defined(__APPLE__)
-#include <tr1/functional>
-using std::tr1::function;
-#else
-#include <functional>
-using std::function;
-#endif
-
 #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)
 
 struct CPUCore
@@ -631,7 +624,7 @@ void CConfigMain::CreateGUIControls()
 	theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name);
 
 	// std::function = avoid error on msvc
-	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function<void(wxEvent&)>([theme_selection](wxEvent&)
+	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([theme_selection](wxEvent&)
 	{
 		SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection();
 		main_frame->InitBitmaps();