diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-29 11:05:44 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-29 11:05:44 +0100 |
| commit | 664c8d30a055f4762a2a60be77c1c8eaec1a5d85 (patch) | |
| tree | ad290b1f173ae3b3c70f4841efd8c46091409579 /Source/Core/Common | |
| parent | 92fc7c64d6980c8000f8b2a8c794c7968cb74da1 (diff) | |
Remove all trailing whitespaces from our codebase.
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Atomic.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/CommonFuncs.h | 6 | ||||
| -rw-r--r-- | Source/Core/Common/IniFile.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/LogManager.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/MemoryUtil.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/NandPaths.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/SettingsHandler.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Thread.h | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Timer.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/x64Emitter.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/x64Emitter.h | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/Source/Core/Common/Atomic.h b/Source/Core/Common/Atomic.h index c76dcb7644..7e9b58a725 100644 --- a/Source/Core/Common/Atomic.h +++ b/Source/Core/Common/Atomic.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#pragma once +#pragma once #ifdef _WIN32 diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 220b76f142..e2ee8936a1 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -31,8 +31,8 @@ struct ArraySizeImpl : public std::extent<T> #define b32(x) (b16(x) | (b16(x) >>16) ) #define ROUND_UP_POW2(x) (b32(x - 1) + 1) -#ifndef __GNUC_PREREQ - #define __GNUC_PREREQ(a, b) 0 +#ifndef __GNUC_PREREQ + #define __GNUC_PREREQ(a, b) 0 #endif #if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \ @@ -188,7 +188,7 @@ inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} -#elif _M_ARM_32 +#elif _M_ARM_32 inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);} diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index 36fe292373..6e80611f1d 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -145,6 +145,6 @@ private: Section* GetSection(const std::string& section); std::string* GetLine(const std::string& section, const std::string& key); void CreateSection(const std::string& section); - + static const std::string& NULL_STRING; }; diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp index 0dfe90445e..bc4f9300c6 100644 --- a/Source/Core/Common/LogManager.cpp +++ b/Source/Core/Common/LogManager.cpp @@ -128,7 +128,7 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, std::string msg = StringFromFormat("%s %s:%u %c[%s]: %s\n", Common::Timer::GetTimeFormatted().c_str(), - file, line, + file, line, LogTypes::LOG_LEVEL_TO_CHAR[(int)level], log->GetShortName(), temp); #ifdef ANDROID diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index e664752910..8e8d27b520 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -52,7 +52,7 @@ void* AllocateExecutableMemory(size_t size, bool low) // printf("Mapped executable memory at %p (size %ld)\n", ptr, // (unsigned long)size); - + #if defined(__FreeBSD__) if (ptr == MAP_FAILED) { diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 03b5fa0209..703cd4e952 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -18,7 +18,7 @@ namespace Common std::string GetTicketFileName(u64 _titleID) { return StringFromFormat("%sticket/%08x/%08x.tik", - File::GetUserPath(D_WIIUSER_IDX).c_str(), + File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID); } @@ -36,7 +36,7 @@ std::string GetTMDFileName(u64 _titleID) std::string GetTitleContentPath(u64 _titleID) { return StringFromFormat("%stitle/%08x/%08x/content/", - File::GetUserPath(D_WIIUSER_IDX).c_str(), + File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(_titleID >> 32), (u32)_titleID); } diff --git a/Source/Core/Common/SettingsHandler.h b/Source/Core/Common/SettingsHandler.h index 238e2d85eb..6099db95f6 100644 --- a/Source/Core/Common/SettingsHandler.h +++ b/Source/Core/Common/SettingsHandler.h @@ -21,7 +21,7 @@ public: // Key used to encrypt/decrypt setting.txt contents INITIAL_SEED = 0x73B5DBFA }; - + void AddSetting(const std::string& key, const std::string& value); const u8 *GetData() const; diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h index 999689cf72..d108359dcd 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -59,8 +59,8 @@ public: void Reset() { std::unique_lock<std::mutex> lk(m_mutex); - // no other action required, since wait loops on - // the predicate and any lingering signal will get + // no other action required, since wait loops on + // the predicate and any lingering signal will get // cleared on the first iteration is_set = false; } diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 0c1ae0826e..1ba750ae99 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -171,7 +171,7 @@ std::string Timer::GetTimeFormatted() { time_t sysTime; time(&sysTime); - + struct tm * gmTime = localtime(&sysTime); char tmp[13]; diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index cee9b6d222..ce4e5964af 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -210,7 +210,7 @@ void OpArg::WriteRest(XEmitter *emit, int extraBytes, X64Reg _operandReg, #if _M_X86_64 u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes; s64 distance = (s64)offset - (s64)ripAddr; - _assert_msg_(DYNA_REC, + _assert_msg_(DYNA_REC, (distance < 0x80000000LL && distance >= -0x80000000LL) || !warn_64bit_offset, diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index 0af6b3b92a..f15287620c 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -200,7 +200,7 @@ inline OpArg ImmPtr(const void* imm) {return Imm64((u64)imm);} inline OpArg ImmPtr(const void* imm) {return Imm32((u32)imm);} #endif inline u32 PtrOffset(void* ptr, void* base) { -#ifdef _ARCH_64 +#ifdef _ARCH_64 s64 distance = (s64)ptr-(s64)base; if (distance >= 0x80000000LL || distance < -0x80000000LL) { |
