diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-02-23 17:02:58 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-02-23 17:02:58 +1300 |
| commit | c30b8c9eae8a72747bf7da77f40f20b35c3d712a (patch) | |
| tree | 5fbb01b93f8dff848936132b6e2fac964bbac7e4 /Source/Core/Common/Src/CPUDetect.cpp | |
| parent | 3d480c088fa27c6dcadef40042a0e8deb3093985 (diff) | |
| parent | ba979582e2d0b4961f1087b76eef659856eb23bb (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Diffstat (limited to 'Source/Core/Common/Src/CPUDetect.cpp')
| -rw-r--r-- | Source/Core/Common/Src/CPUDetect.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 65cd6dbd0b..282929e7b2 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -205,14 +205,7 @@ void CPUInfo::Detect() // Turn the cpu info into a string we can show std::string CPUInfo::Summarize() { - std::string sum; - if (num_cores == 1) - sum = StringFromFormat("%s, %i core", cpu_string, num_cores); - else - { - sum = StringFromFormat("%s, %i cores", cpu_string, num_cores); - if (HTT) sum += StringFromFormat(" (%i logical threads per physical core)", logical_cpu_count); - } + std::string sum(cpu_string); if (bSSE) sum += ", SSE"; if (bSSE2) sum += ", SSE2"; if (bSSE3) sum += ", SSE3"; |