From 538760b37cf128ba6056dcb720703010925660da Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:53:03 +0800
Subject: [PATCH] fix tests
---
src/inspector/inspector.cpp | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 160c016..d99b276 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -6,11 +6,19 @@
#include "../library/os/cpu_info.hpp"
using namespace std;
-const map<LCC_API_IDENTIFICATION_STRATEGY, string> stringByStrategyId = {
+
+struct enum_hash {
+ template <typename T>
+ constexpr typename std::enable_if<std::is_enum<T>::value, std::size_t>::type operator()(T s) const noexcept {
+ return static_cast<std::size_t>(s);
+ }
+};
+
+const map<LCC_API_IDENTIFICATION_STRATEGY, string, enum_hash> stringByStrategyId = {
{STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"}, {STRATEGY_IP_ADDRESS, "IP"},
{STRATEGY_DISK_NUM, "Disk1"}, {STRATEGY_DISK_LABEL, "Disk2"}, {STRATEGY_NONE, "Custom"}};
-const unordered_map<LCC_EVENT_TYPE, string> stringByEventType = {
+const unordered_map<LCC_EVENT_TYPE, string, enum_hash> stringByEventType = {
{LICENSE_OK, "OK "},
{LICENSE_FILE_NOT_FOUND, "license file not found "},
{LICENSE_SERVER_NOT_FOUND, "license server can't be contacted "},
@@ -37,16 +45,16 @@
}
int main(int argc, char* argv[]) {
- license::CpuInfo cpu;
+ license::os::CpuInfo cpu;
cout << "CpuVendor :" << cpu.vendor() << endl;
cout << "Virtual machine:" << cpu.cpu_virtual() << endl;
cout << "Cpu model : 0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
- char pc_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
+ char hw_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
size_t bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
for (const auto& x : stringByStrategyId) {
- if (identify_pc(x.first, pc_identifier, &bufSize)) {
- std::cout << x.second << ':' << pc_identifier << std::endl;
+ if (identify_pc(x.first, hw_identifier, &bufSize)) {
+ std::cout << x.second << ':' << hw_identifier << std::endl;
} else {
std::cout << x.second << ": NA" << endl;
--
Gitblit v1.9.1