diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-04-30 17:34:51 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-04-30 18:02:41 +0200 |
| commit | 691a42fe98954c247a8b7e9305a3e9ca5c04d40c (patch) | |
| tree | 52b6a286b6609675cbc69c63b3aa9f695ea95f0f /src/common | |
| parent | LCD: Remove unneeded #undef with no matching #define. (diff) | |
| download | yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.gz yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.bz2 yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.lz yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.xz yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.tar.zst yuzu-691a42fe98954c247a8b7e9305a3e9ca5c04d40c.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/bit_field.h | 2 | ||||
| -rw-r--r-- | src/common/bit_set.h | 3 | ||||
| -rw-r--r-- | src/common/code_block.h | 6 | ||||
| -rw-r--r-- | src/common/common_funcs.h | 4 | ||||
| -rw-r--r-- | src/common/file_util.h | 2 | ||||
| -rw-r--r-- | src/common/x64/emitter.h | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index 371eb17a1..4748999ed 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -186,5 +186,5 @@ private: #pragma pack() #if (__GNUC__ >= 5) || defined(__clang__) || defined(_MSC_VER) -static_assert(std::is_trivially_copyable<BitField<0, 1, u32>>::value, "BitField must be trivially copyable"); +static_assert(std::is_trivially_copyable<BitField<0, 1, unsigned>>::value, "BitField must be trivially copyable"); #endif diff --git a/src/common/bit_set.h b/src/common/bit_set.h index 85f91e786..7f5de8df2 100644 --- a/src/common/bit_set.h +++ b/src/common/bit_set.h @@ -7,6 +7,7 @@ #include <intrin.h> #endif #include <initializer_list> +#include <new> #include <type_traits> #include "common/common_types.h" @@ -186,4 +187,4 @@ public: typedef Common::BitSet<u8> BitSet8; typedef Common::BitSet<u16> BitSet16; typedef Common::BitSet<u32> BitSet32; -typedef Common::BitSet<u64> BitSet64;
\ No newline at end of file +typedef Common::BitSet<u64> BitSet64; diff --git a/src/common/code_block.h b/src/common/code_block.h index 9ef7296d3..2fa4a0090 100644 --- a/src/common/code_block.h +++ b/src/common/code_block.h @@ -4,8 +4,10 @@ #pragma once -#include "common_types.h" -#include "memory_util.h" +#include <cstddef> + +#include "common/common_types.h" +#include "common/memory_util.h" // Everything that needs to generate code should inherit from this. // You get memory management for free, plus, you can use all emitter functions without diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index aa6aff7b9..ab3515683 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -4,6 +4,10 @@ #pragma once +#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])) diff --git a/src/common/file_util.h b/src/common/file_util.h index 3aac4fa46..c6a8694ce 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -7,9 +7,9 @@ #include <array> #include <fstream> #include <functional> -#include <cstddef> #include <cstdio> #include <string> +#include <type_traits> #include <vector> #include "common/common_types.h" diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h index a33724146..60a77dfe1 100644 --- a/src/common/x64/emitter.h +++ b/src/common/x64/emitter.h @@ -17,6 +17,8 @@ #pragma once +#include <cstddef> + #include "common/assert.h" #include "common/bit_set.h" #include "common/common_types.h" |