diff options
author | Brad King <brad.king@kitware.com> | 2013-02-01 14:28:50 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-02-01 14:28:50 (GMT) |
commit | 588d705cb1ec1d37f10711eb9c0a9e2398805f47 (patch) | |
tree | 71691c5a413f331682a6812f7f5a28a3430e1551 /Source/kwsys/SystemInformation.cxx | |
parent | 163812468054601c95ac894703a6299d3b324e22 (diff) | |
parent | 23ae48412093e4acbd5270536aace226d5869679 (diff) | |
download | CMake-588d705cb1ec1d37f10711eb9c0a9e2398805f47.zip CMake-588d705cb1ec1d37f10711eb9c0a9e2398805f47.tar.gz CMake-588d705cb1ec1d37f10711eb9c0a9e2398805f47.tar.bz2 |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
-rw-r--r-- | Source/kwsys/SystemInformation.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index b20d724..f057e0f 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -2466,7 +2466,9 @@ bool SystemInformationImplementation::RetrieveCPUPowerManagement() #endif } -void SystemInformationStripLeadingSpace(kwsys_stl::string& str) +#if USE_CPUID +// Used only in USE_CPUID implementation below. +static void SystemInformationStripLeadingSpace(kwsys_stl::string& str) { // Because some manufacturers have leading white space - we have to post-process the name. kwsys_stl::string::size_type pos = str.find_first_not_of(" "); @@ -2475,6 +2477,7 @@ void SystemInformationStripLeadingSpace(kwsys_stl::string& str) str = str.substr(pos); } } +#endif /** */ bool SystemInformationImplementation::RetrieveExtendedCPUIdentity() |