From 541aef5e90db404e580ac94dd4661d908c4c752f Mon Sep 17 00:00:00 2001 From: amerhifi Date: Mon, 13 May 2019 09:56:10 -0700 Subject: [PATCH] fixing warnings --- libraries/platform/src/WINPlatform.cpp | 5 +++-- libraries/platform/src/platform.h | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/platform/src/WINPlatform.cpp b/libraries/platform/src/WINPlatform.cpp index 5ff782893b..26106bb207 100644 --- a/libraries/platform/src/WINPlatform.cpp +++ b/libraries/platform/src/WINPlatform.cpp @@ -29,14 +29,15 @@ bool WINInstance::enumeratePlatform() { void WINInstance::enumerateCpu() { json cpu = {}; + + +#ifdef Q_OS_WINDOWS int CPUInfo[4] = { -1 }; unsigned nExIds; unsigned int i = 0; char CPUBrandString[16]; char CPUModelString[16]; char CPUClockString[16]; - -#ifdef Q_OS_WINDOWS // Get the information associated with each extended ID. __cpuid(CPUInfo, 0x80000000); nExIds = CPUInfo[0]; diff --git a/libraries/platform/src/platform.h b/libraries/platform/src/platform.h index 920caa5419..1a885982bb 100644 --- a/libraries/platform/src/platform.h +++ b/libraries/platform/src/platform.h @@ -19,16 +19,16 @@ class Instance { public: bool virtual enumeratePlatform() = 0; - int getNumCPU() { return _cpu.size(); } + int getNumCPU() { return (int)_cpu.size(); } json getCPU(int index); - int getNumGPU() { return _gpu.size(); } + int getNumGPU() { return (int)_gpu.size(); } json getGPU(int index); - int getNumMemory() { return _memory.size(); } + int getNumMemory() { return (int)_memory.size(); } json getMemory(int index); - int getNumDisplay() { return _display.size(); } + int getNumDisplay() { return (int)_display.size(); } json getDisplay(int index); virtual ~Instance();