Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename CPUID to CPUIdent to fix XCode 7.2 builds

Browse source
This commit is contained in:
Anthony J. Thibault 2016-04-11 11:52:33 -07:00
parent b758acb7d8
commit 470aac3acf
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/CPUID.cpp → libraries/shared/src/CPUIdent.cpp
View file

@ -1,5 +1,5 @@
//
// CPUID.cpp
// CPUIdent.cpp
//
// Created by Ryan Huffman on 3/25/16.
// Copyright 2016 High Fidelity, Inc.
@ -8,7 +8,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "CPUID.h"
#include "CPUIdent.h"
#ifdef Q_OS_WIN
@ -72,4 +72,4 @@ std::vector<CPUID::Feature> CPUID::getAllFeatures() {
return features;
};
#endif
#endif

8
libraries/shared/src/CPUID.h → libraries/shared/src/CPUIdent.h
View file

@ -1,5 +1,5 @@
//
// CPUID.h
// CPUIdent.h
//
// Adapted from Microsoft's example for using the cpuid intrinsic,
// found at https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
@ -15,8 +15,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_CPUID_h
#define hifi_CPUID_h
#ifndef hifi_CPUIdent_h
#define hifi_CPUIdent_h
#include <QtCore/QtGlobal>
@ -209,4 +209,4 @@ private:
#endif
#endif // hifi_CPUID_h
#endif // hifi_CPUIdent_h

10
libraries/shared/src/SharedUtil.cpp
View file

@ -24,7 +24,7 @@
#endif
#ifdef Q_OS_WIN
#include "CPUID.h"
#include "CPUIdent.h"
#endif
@ -758,10 +758,10 @@ void printSystemInformation() {
qDebug() << "CPUID";
qDebug() << "\tCPU Vendor: " << CPUID::Vendor().c_str();
qDebug() << "\tCPU Brand: " << CPUID::Brand().c_str();
qDebug() << "\tCPU Vendor: " << CPUIdent::Vendor().c_str();
qDebug() << "\tCPU Brand: " << CPUIdent::Brand().c_str();
for (auto& feature : CPUID::getAllFeatures()) {
for (auto& feature : CPUIdent::getAllFeatures()) {
qDebug().nospace().noquote() << "\t[" << (feature.supported ? "x" : " ") << "] " << feature.name.c_str();
}
#endif
@ -777,4 +777,4 @@ void printSystemInformation() {
qDebug().noquote().nospace() << "\t" <<
(envVariables.contains(env) ? " = " + envVariables.value(env) : " NOT FOUND");
}
}
}