From 8bbef2865455754425a84b86680a89bff8aa7691 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 19 10月 2019 08:50:45 +0800
Subject: [PATCH] issue #64 , issue #56 (part)
---
src/library/locate/LocatorFactory.cpp | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/library/locate/LocatorFactory.cpp b/src/library/locate/LocatorFactory.cpp
index be9cd67..1b45752 100644
--- a/src/library/locate/LocatorFactory.cpp
+++ b/src/library/locate/LocatorFactory.cpp
@@ -10,34 +10,32 @@
#include "LocatorStrategy.hpp"
#include "LocatorFactory.hpp"
#include "ApplicationFolder.hpp"
-//#include "EnvironmentVarData.hpp"
+#include "EnvironmentVarData.hpp"
#include "EnvironmentVarLocation.hpp"
#include "ExternalDefinition.hpp"
namespace license {
namespace locate {
-using namespace std;
-
-FUNCTION_RETURN LocatorFactory::getActiveStrategies(
- vector<unique_ptr<LocatorStrategy>> &strategies,
- const char *locationHint) {
+FUNCTION_RETURN LocatorFactory::get_active_strategies(
+ std::vector<std::unique_ptr<LocatorStrategy>> &strategies,
+ const LicenseLocation *locationHint) {
#if(FIND_LICENSE_NEAR_MODULE)
strategies.push_back(
- unique_ptr<LocatorStrategy>(
+ std::unique_ptr<LocatorStrategy>(
(LocatorStrategy*) new ApplicationFolder()));
#endif
#if(FIND_LICENSE_WITH_ENV_VAR)
strategies.push_back(
- unique_ptr<LocatorStrategy>(
+ std::unique_ptr<LocatorStrategy>(
(LocatorStrategy*) new EnvironmentVarLocation()));
-// strategies.push_back(
-// unique_ptr<LocatorStrategy>(
-// (LocatorStrategy*) new EnvironmentVarData()));
+ strategies.push_back(
+ std::unique_ptr<LocatorStrategy>(
+ (LocatorStrategy*) new EnvironmentVarData()));
#endif
if (locationHint != nullptr) {
strategies.push_back(
- unique_ptr<LocatorStrategy>(
+ std::unique_ptr<LocatorStrategy>(
(LocatorStrategy*) new ExternalDefinition(locationHint)));
}
return strategies.size() > 0 ? FUNC_RET_OK : FUNC_RET_NOT_AVAIL;
--
Gitblit v1.9.1