Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove empty newlines in #include blocks.

Browse source 
This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
This commit is contained in:
Emmanuel Gil Peyrot 2016-09-21 00:21:23 +09:00
parent 396a8d91a4
commit ebdae19fd2
289 changed files with 233 additions and 750 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/assert.h
View file

@ -5,7 +5,6 @@
#pragma once
#include <cstdlib>
#include "common/common_funcs.h"
#include "common/logging/log.h"
@ -54,4 +53,4 @@ __declspec(noinline, noreturn)
#endif
#define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!")
#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)

1
src/common/bit_field.h
View file

@ -33,7 +33,6 @@
#include <cstddef>
#include <limits>
#include <type_traits>
#include "common/common_funcs.h"
/*

3
src/common/break_points.cpp
View file

@ -3,10 +3,9 @@
// Refer to the license.txt file included.
#include "common/break_points.h"
#include "common/logging/log.h"
#include <algorithm>
#include <sstream>
#include "common/logging/log.h"
bool BreakPoints::IsAddressBreakPoint(u32 iAddress) const {
auto cond = [&iAddress](const TBreakPoint& bp) { return bp.iAddress == iAddress; };

1
src/common/break_points.h
View file

@ -6,7 +6,6 @@
#include <string>
#include <vector>
#include "common/common_types.h"
class DebugInterface;

1
src/common/chunk_file.h
View file

@ -35,7 +35,6 @@
#include <type_traits>
#include <utility>
#include <vector>
#include "common/assert.h"
#include "common/common_types.h"
#include "common/logging/log.h"

1
src/common/code_block.h
View file

@ -5,7 +5,6 @@
#pragma once
#include <cstddef>
#include "common/common_types.h"
#include "common/memory_util.h"

1
src/common/common_funcs.h
View file

@ -7,7 +7,6 @@
#if !defined(ARCHITECTURE_x86_64) && !defined(_M_ARM)
#include <cstdlib> // for exit
#endif
#include "common_types.h"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))

4
src/common/emu_window.cpp
View file

@ -2,13 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "emu_window.h"
#include <algorithm>
#include <cmath>
#include "common/assert.h"
#include "common/key_map.h"
#include "emu_window.h"
#include "video_core/video_core.h"
void EmuWindow::ButtonPressed(Service::HID::PadState pad) {

2
src/common/emu_window.h
View file

@ -6,10 +6,8 @@
#include <tuple>
#include <utility>
#include "common/common_types.h"
#include "common/math_util.h"
#include "core/hle/service/hid/hid.h"
/**

1
src/common/file_util.cpp
View file

@ -16,7 +16,6 @@
#include <shellapi.h>
#include <shlobj.h> // for SHGetFolderPath
#include <tchar.h>
#include "common/string_util.h"
// 64 bit offsets for windows

2
src/common/file_util.h
View file

@ -11,9 +11,7 @@
#include <string>
#include <type_traits>
#include <vector>
#include "common/common_types.h"
#ifdef _MSC_VER
#include "common/string_util.h"
#endif

1
src/common/hash.cpp
View file

@ -5,7 +5,6 @@
#if defined(_MSC_VER)
#include <stdlib.h>
#endif
#include "common_funcs.h"
#include "common_types.h"
#include "hash.h"

5
src/common/key_map.cpp
View file

@ -2,10 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <map>
#include "common/emu_window.h"
#include "common/key_map.h"
#include <map>
#include "common/emu_window.h"
namespace KeyMap {

3
src/common/logging/backend.cpp
View file

@ -2,13 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/logging/backend.h"
#include <algorithm>
#include <array>
#include <cstdio>
#include "common/assert.h"
#include "common/common_funcs.h" // snprintf compatibility define
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"

1
src/common/logging/backend.h
View file

@ -8,7 +8,6 @@
#include <cstdarg>
#include <string>
#include <utility>
#include "common/logging/log.h"
namespace Log {

5
src/common/logging/filter.cpp
View file

@ -2,10 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <algorithm>
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include <algorithm>
#include "common/logging/backend.h"
#include "common/string_util.h"
namespace Log {

1
src/common/logging/filter.h
View file

@ -7,7 +7,6 @@
#include <array>
#include <cstddef>
#include <string>
#include "common/logging/log.h"
namespace Log {

5
src/common/logging/text_formatter.cpp
View file

@ -10,12 +10,11 @@
#include <Windows.h>
#endif
#include "common/assert.h"
#include "common/common_funcs.h"
#include "common/logging/backend.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"
#include "common/assert.h"
#include "common/common_funcs.h"
#include "common/string_util.h"
namespace Log {

1
src/common/misc.cpp
View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include <cstddef>
#ifdef _WIN32
#include <windows.h>
#else

1
src/common/profiler.cpp
View file

@ -5,7 +5,6 @@
#include <algorithm>
#include <cstddef>
#include <vector>
#include "common/assert.h"
#include "common/profiler_reporting.h"
#include "common/synchronized_wrapper.h"

1
src/common/profiler_reporting.h
View file

@ -7,7 +7,6 @@
#include <chrono>
#include <cstddef>
#include <vector>
#include "common/synchronized_wrapper.h"
namespace Common {

4
src/common/string_util.cpp
View file

@ -2,17 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/string_util.h"
#include <cctype>
#include <cerrno>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <boost/range/algorithm/transform.hpp>
#include "common/common_paths.h"
#include "common/logging/log.h"
#include "common/string_util.h"
#ifdef _MSC_VER
#include <Windows.h>
#include <codecvt>

1
src/common/string_util.h
View file

@ -10,7 +10,6 @@
#include <sstream>
#include <string>
#include <vector>
#include "common/common_types.h"
namespace Common {

2
src/common/swap.h
View file

@ -24,9 +24,7 @@
#elif defined(__FreeBSD__)
#include <sys/endian.h>
#endif
#include <cstring>
#include "common/common_types.h"
// GCC 4.6+

1
src/common/symbols.h
View file

@ -7,7 +7,6 @@
#include <map>
#include <string>
#include <utility>
#include "common/common_types.h"
struct TSymbol {

2
src/common/thread.cpp
View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "common/thread.h"
#ifdef __APPLE__
#include <mach/mach.h>
#elif defined(_WIN32)
@ -16,7 +15,6 @@
#endif
#include <sched.h>
#endif
#ifndef _WIN32
#include <unistd.h>
#endif

1
src/common/thread.h
View file

@ -8,7 +8,6 @@
#include <cstddef>
#include <mutex>
#include <thread>
#include "common/common_types.h"
// Support for C++11's thread_local keyword was surprisingly spotty in compilers until very

1
src/common/thread_queue_list.h
View file

@ -6,7 +6,6 @@
#include <array>
#include <deque>
#include <boost/range/algorithm_ext/erase.hpp>
namespace Common {

2
src/common/timer.cpp
View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include <time.h>
#ifdef _WIN32
#include <Windows.h>
#include <mmsystem.h>
@ -11,7 +10,6 @@
#else
#include <sys/time.h>
#endif
#include "common/common_types.h"
#include "common/string_util.h"
#include "common/timer.h"

4
src/common/x64/cpu_detect.cpp
View file

@ -2,14 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "cpu_detect.h"
#include <cstring>
#include <string>
#include <thread>
#include "common/common_types.h"
#include "cpu_detect.h"
namespace Common {
#ifndef _MSC_VER

8
src/common/x64/emitter.cpp
View file

@ -15,16 +15,14 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "emitter.h"
#include <cinttypes>
#include <cstring>
#include "abi.h"
#include "common/assert.h"
#include "common/logging/log.h"
#include "common/memory_util.h"
#include "abi.h"
#include "cpu_detect.h"
#include "emitter.h"
namespace Gen {
@ -222,7 +220,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp
void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
bool warn_64bit_offset) const {
if (_operandReg == INVALID_REG)
_operandReg = (X64Reg)this->operandReg;
_operandReg = (X64Reg) this->operandReg;
int mod = 0;
int ireg = indexReg;
bool SIB = false;

1
src/common/x64/emitter.h
View file

@ -18,7 +18,6 @@
#pragma once
#include <cstddef>
#include "common/assert.h"
#include "common/bit_set.h"
#include "common/code_block.h"