ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3041 from lioncash/align 

Common: Get rid of a few pointer casts
This commit is contained in:
flacs 2015-09-15 20:40:05 +02:00
parent 7eeeb9f754 2c5c99ec71
commit 955bef226e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Common/LinearDiskCache.h
View File

@ -170,14 +170,15 @@ private:
struct Header
{
Header()
: id(*(u32*)"DCAC")
, key_t_size(sizeof(K))
: key_t_size(sizeof(K))
, value_t_size(sizeof(V))
{
memcpy(ver, scm_rev_git_str, 40);
// Null-terminator is intentionally not copied.
std::memcpy(&id, "DCAC", sizeof(u32));
std::memcpy(ver, scm_rev_git_str, 40);
}
const u32 id;
u32 id;
const u16 key_t_size, value_t_size;
char ver[40];

6
Source/Core/Common/x64CPUDetect.cpp
View File

@ -82,9 +82,9 @@ void CPUInfo::Detect()
// Detect CPU's CPUID capabilities, and grab CPU string
__cpuid(cpu_id, 0x00000000);
u32 max_std_fn = cpu_id[0]; // EAX
*((int *)brand_string) = cpu_id[1];
*((int *)(brand_string + 4)) = cpu_id[3];
*((int *)(brand_string + 8)) = cpu_id[2];
std::memcpy(&brand_string[0], &cpu_id[1], sizeof(int));
std::memcpy(&brand_string[4], &cpu_id[3], sizeof(int));
std::memcpy(&brand_string[8], &cpu_id[2], sizeof(int));
__cpuid(cpu_id, 0x80000000);
u32 max_ex_fn = cpu_id[0];
if (!strcmp(brand_string, "GenuineIntel"))