From b155a0534bb9d09f7872545e5aa4428cdadb83a4 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 25 Mar 2016 16:23:48 -0700 Subject: [PATCH] Fix brace placement in CPUID --- libraries/shared/src/CPUID.h | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libraries/shared/src/CPUID.h b/libraries/shared/src/CPUID.h index 4040bbad05..bc697c8781 100644 --- a/libraries/shared/src/CPUID.h +++ b/libraries/shared/src/CPUID.h @@ -125,8 +125,7 @@ private: __cpuid(cpui.data(), 0); nIds_ = cpui[0]; - for (int i = 0; i <= nIds_; ++i) - { + for (int i = 0; i <= nIds_; ++i) { __cpuidex(cpui.data(), i, 0); data_.push_back(cpui); } @@ -138,25 +137,20 @@ private: *reinterpret_cast(vendor + 4) = data_[0][3]; *reinterpret_cast(vendor + 8) = data_[0][2]; vendor_ = vendor; - if (vendor_ == "GenuineIntel") - { + if (vendor_ == "GenuineIntel") { isIntel_ = true; - } - else if (vendor_ == "AuthenticAMD") - { + } else if (vendor_ == "AuthenticAMD") { isAMD_ = true; } // load bitset with flags for function 0x00000001 - if (nIds_ >= 1) - { + if (nIds_ >= 1) { f_1_ECX_ = data_[1][2]; f_1_EDX_ = data_[1][3]; } // load bitset with flags for function 0x00000007 - if (nIds_ >= 7) - { + if (nIds_ >= 7) { f_7_EBX_ = data_[7][1]; f_7_ECX_ = data_[7][2]; } @@ -169,22 +163,19 @@ private: char brand[0x40]; memset(brand, 0, sizeof(brand)); - for (int i = 0x80000000; i <= nExIds_; ++i) - { + for (int i = 0x80000000; i <= nExIds_; ++i) { __cpuidex(cpui.data(), i, 0); extdata_.push_back(cpui); } // load bitset with flags for function 0x80000001 - if (nExIds_ >= 0x80000001) - { + if (nExIds_ >= 0x80000001) { f_81_ECX_ = extdata_[1][2]; f_81_EDX_ = extdata_[1][3]; } // Interpret CPU brand string if reported - if (nExIds_ >= 0x80000004) - { + if (nExIds_ >= 0x80000004) { memcpy(brand, extdata_[2].data(), sizeof(cpui)); memcpy(brand + 16, extdata_[3].data(), sizeof(cpui)); memcpy(brand + 32, extdata_[4].data(), sizeof(cpui));