Reformat all the things. Have fun with merge conflicts.

1 files changed, 52 insertions, 52 deletions

diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp
index 29420dd170..557cbfbef2 100644
--- a/Source/Core/Common/Thread.cpp
+++ b/Source/Core/Common/Thread.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Thread.h"
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
-#include "Common/Thread.h"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -23,15 +23,14 @@
 
 namespace Common
 {
-
 int CurrentThreadId()
 {
 #ifdef _WIN32
-	return GetCurrentThreadId();
+  return GetCurrentThreadId();
 #elif defined __APPLE__
-	return mach_thread_self();
+  return mach_thread_self();
 #else
-	return 0;
+  return 0;
 #endif
 }
 
@@ -39,23 +38,23 @@ int CurrentThreadId()
 
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
 {
-	SetThreadAffinityMask(thread, mask);
+  SetThreadAffinityMask(thread, mask);
 }
 
 void SetCurrentThreadAffinity(u32 mask)
 {
-	SetThreadAffinityMask(GetCurrentThread(), mask);
+  SetThreadAffinityMask(GetCurrentThread(), mask);
 }
 
 // Supporting functions
 void SleepCurrentThread(int ms)
 {
-	Sleep(ms);
+  Sleep(ms);
 }
 
 void SwitchCurrentThread()
 {
-	SwitchToThread();
+  SwitchToThread();
 }
 
 // Sets the debugger-visible name of the current thread.
@@ -66,85 +65,86 @@ void SwitchCurrentThread()
 // http://msdn.microsoft.com/en-us/library/xcb2z8hs(VS.100).aspx
 void SetCurrentThreadName(const char* szThreadName)
 {
-	static const DWORD MS_VC_EXCEPTION = 0x406D1388;
-
-	#pragma pack(push,8)
-	struct THREADNAME_INFO
-	{
-		DWORD dwType; // must be 0x1000
-		LPCSTR szName; // pointer to name (in user addr space)
-		DWORD dwThreadID; // thread ID (-1=caller thread)
-		DWORD dwFlags; // reserved for future use, must be zero
-	} info;
-	#pragma pack(pop)
-
-	info.dwType = 0x1000;
-	info.szName = szThreadName;
-	info.dwThreadID = -1; //dwThreadID;
-	info.dwFlags = 0;
-
-	__try
-	{
-		RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
-	}
-	__except(EXCEPTION_CONTINUE_EXECUTION)
-	{}
+  static const DWORD MS_VC_EXCEPTION = 0x406D1388;
+
+#pragma pack(push, 8)
+  struct THREADNAME_INFO
+  {
+    DWORD dwType;      // must be 0x1000
+    LPCSTR szName;     // pointer to name (in user addr space)
+    DWORD dwThreadID;  // thread ID (-1=caller thread)
+    DWORD dwFlags;     // reserved for future use, must be zero
+  } info;
+#pragma pack(pop)
+
+  info.dwType = 0x1000;
+  info.szName = szThreadName;
+  info.dwThreadID = -1;  // dwThreadID;
+  info.dwFlags = 0;
+
+  __try
+  {
+    RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+  }
+  __except (EXCEPTION_CONTINUE_EXECUTION)
+  {
+  }
 }
 
-#else // !WIN32, so must be POSIX threads
+#else  // !WIN32, so must be POSIX threads
 
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
 {
 #ifdef __APPLE__
-	thread_policy_set(pthread_mach_thread_np(thread),
-		THREAD_AFFINITY_POLICY, (integer_t*)&mask, 1);
+  thread_policy_set(pthread_mach_thread_np(thread), THREAD_AFFINITY_POLICY, (integer_t*)&mask, 1);
 #elif (defined __linux__ || defined BSD4_4 || defined __FreeBSD__) && !(defined ANDROID)
 #ifdef __FreeBSD__
-	cpuset_t cpu_set;
+  cpuset_t cpu_set;
 #else
-	cpu_set_t cpu_set;
+  cpu_set_t cpu_set;
 #endif
-	CPU_ZERO(&cpu_set);
+  CPU_ZERO(&cpu_set);
 
-	for (int i = 0; i != sizeof(mask) * 8; ++i)
-		if ((mask >> i) & 1)
-			CPU_SET(i, &cpu_set);
+  for (int i = 0; i != sizeof(mask) * 8; ++i)
+    if ((mask >> i) & 1)
+      CPU_SET(i, &cpu_set);
 
-	pthread_setaffinity_np(thread, sizeof(cpu_set), &cpu_set);
+  pthread_setaffinity_np(thread, sizeof(cpu_set), &cpu_set);
 #endif
 }
 
 void SetCurrentThreadAffinity(u32 mask)
 {
-	SetThreadAffinity(pthread_self(), mask);
+  SetThreadAffinity(pthread_self(), mask);
 }
 
 void SleepCurrentThread(int ms)
 {
-	usleep(1000 * ms);
+  usleep(1000 * ms);
 }
 
 void SwitchCurrentThread()
 {
-	usleep(1000 * 1);
+  usleep(1000 * 1);
 }
 
 void SetCurrentThreadName(const char* szThreadName)
 {
 #ifdef __APPLE__
-	pthread_setname_np(szThreadName);
+  pthread_setname_np(szThreadName);
 #elif defined __FreeBSD__
-	pthread_set_name_np(pthread_self(), szThreadName);
+  pthread_set_name_np(pthread_self(), szThreadName);
 #else
-	// linux doesn't allow to set more than 16 bytes, including \0.
-	pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str());
+  // linux doesn't allow to set more than 16 bytes, including \0.
+  pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str());
 #endif
 #ifdef USE_VTUNE
-	// VTune uses OS thread names by default but probably supports longer names when set via its own API.
-	__itt_thread_set_name(szThreadName);
+  // VTune uses OS thread names by default but probably supports longer names when set via its own
+  // API.
+  __itt_thread_set_name(szThreadName);
 #endif
 }
 
 #endif
 
-} // namespace Common
+}  // namespace Common