From 5a8a12d7a2c69610cd7a9a00ed1b3579b750a914 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 16 11月 2019 21:39:10 +0800
Subject: [PATCH] issue #42 #38 \n review build system, \n issue #38 added clang format
---
src/library/locate/LocatorFactory.cpp | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/src/library/locate/LocatorFactory.cpp b/src/library/locate/LocatorFactory.cpp
index be9cd67..667a387 100644
--- a/src/library/locate/LocatorFactory.cpp
+++ b/src/library/locate/LocatorFactory.cpp
@@ -5,44 +5,32 @@
* Author: Gabriele Contini
*/
-#include "build_properties.h"
+#include "licensecc_properties.h"
#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) {
-#if(FIND_LICENSE_NEAR_MODULE)
- strategies.push_back(
- unique_ptr<LocatorStrategy>(
- (LocatorStrategy*) new ApplicationFolder()));
+FUNCTION_RETURN LocatorFactory::get_active_strategies(std::vector<std::unique_ptr<LocatorStrategy>> &strategies,
+ const LicenseLocation *locationHint) {
+#if (FIND_LICENSE_NEAR_MODULE)
+ strategies.push_back(std::unique_ptr<LocatorStrategy>((LocatorStrategy *)new ApplicationFolder()));
#endif
-#if(FIND_LICENSE_WITH_ENV_VAR)
- strategies.push_back(
- unique_ptr<LocatorStrategy>(
- (LocatorStrategy*) new EnvironmentVarLocation()));
-// strategies.push_back(
-// unique_ptr<LocatorStrategy>(
-// (LocatorStrategy*) new EnvironmentVarData()));
+#if (FIND_LICENSE_WITH_ENV_VAR)
+ strategies.push_back(std::unique_ptr<LocatorStrategy>((LocatorStrategy *)new EnvironmentVarLocation()));
+ strategies.push_back(std::unique_ptr<LocatorStrategy>((LocatorStrategy *)new EnvironmentVarData()));
#endif
if (locationHint != nullptr) {
- strategies.push_back(
- unique_ptr<LocatorStrategy>(
- (LocatorStrategy*) new ExternalDefinition(locationHint)));
+ strategies.push_back(std::unique_ptr<LocatorStrategy>((LocatorStrategy *)new ExternalDefinition(locationHint)));
}
return strategies.size() > 0 ? FUNC_RET_OK : FUNC_RET_NOT_AVAIL;
-
}
-}
-}
+} // namespace locate
+} // namespace license
--
Gitblit v1.9.1