From 71c9792c6cd2dc3da5f993876c2fc7ac62366360 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 08 3月 2020 22:13:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers
---
src/library/hw_identifier/hw_identifier_facade.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/library/hw_identifier/hw_identifier_facade.cpp b/src/library/hw_identifier/hw_identifier_facade.cpp
index 45abb5d..755eb75 100644
--- a/src/library/hw_identifier/hw_identifier_facade.cpp
+++ b/src/library/hw_identifier/hw_identifier_facade.cpp
@@ -57,16 +57,16 @@
if (result != FUNC_RET_OK) {
/// FIXME
}
- ExecutionEnvironment exec;
- VIRTUALIZATION virtualization = exec.getVirtualization();
+ os::ExecutionEnvironment exec;
+ os::VIRTUALIZATION virtualization = exec.getVirtualization();
pc_id.set_virtual_environment(virtualization);
pc_id.set_use_environment_var(use_env_var);
- if (virtualization != NONE) {
+ if (virtualization != os::NONE) {
bool isCloud = exec.is_cloud();
if (isCloud) {
pc_id.set_cloud_provider(exec.getCloudProvider());
} else {
- CpuInfo cpu;
+ os::CpuInfo cpu;
pc_id.set_virtualization(cpu.getVirtualizationDetail());
}
}
--
Gitblit v1.9.1