From 55419547206c2be326503a220575d6a124ea16cc Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 21 9月 2019 01:34:22 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop
---
src/tools/base_lib/CryptoHelper.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tools/base_lib/CryptoHelper.cpp b/src/tools/base_lib/CryptoHelper.cpp
index afa566d..530596e 100644
--- a/src/tools/base_lib/CryptoHelper.cpp
+++ b/src/tools/base_lib/CryptoHelper.cpp
@@ -1,8 +1,8 @@
#include <memory>
#include "CryptoHelper.h"
-#ifndef _MSC_VER
+#ifdef __linux__
#include"linux/CryptoHelperLinux.h"
-#else
+#elif _WIN32
#include"win/CryptoHelperWindows.h"
#endif
@@ -10,11 +10,12 @@
namespace license {
unique_ptr<CryptoHelper> CryptoHelper::getInstance() {
-#ifndef _MSC_VER
+#ifdef __linux__
unique_ptr<CryptoHelper> ptr((CryptoHelper*) new CryptoHelperLinux());
-#else
- unique_ptr<CryptoHelper> ptr((CryptoHelper*) new CryptoHelperWindows());
+#elif _WIN32
+ unique_ptr<CryptoHelper> ptr((CryptoHelper*) new CryptoHelperWindows());
#endif
return ptr;
}
}
+
--
Gitblit v1.9.1