From 65454077a8c63b50adda4e8c6095c8f00675c4d2 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 08 3月 2020 21:45:16 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' of https://github.com/open-license-manager/open-license-manager.git into feature/pc_identifiers
---
src/library/locate/LocatorFactory.hpp | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/library/locate/LocatorFactory.hpp b/src/library/locate/LocatorFactory.hpp
index 5231107..9a1f22c 100644
--- a/src/library/locate/LocatorFactory.hpp
+++ b/src/library/locate/LocatorFactory.hpp
@@ -4,6 +4,8 @@
#include <cstddef>
#include <string>
#include <vector>
+#include <licensecc/datatypes.h>
+#include <licensecc_properties.h>
#include "../base/base.h"
#include "LocatorStrategy.hpp"
@@ -13,16 +15,18 @@
class LocatorFactory {
private:
+ static bool find_license_near_moduleb;
+ static bool find_license_with_env_varb;
inline LocatorFactory() {
}
inline ~LocatorFactory() {
}
public:
-
- static FUNCTION_RETURN getActiveStrategies(
+ static FUNCTION_RETURN get_active_strategies(
std::vector<std::unique_ptr<LocatorStrategy>> &strategiesOut,
- const char *locationHint);
-
+ const LicenseLocation *locationHint);
+ static void find_license_near_module(bool enable) { find_license_near_moduleb = enable; }
+ static void find_license_with_env_var(bool enable) { find_license_with_env_varb = enable; }
};
}
--
Gitblit v1.9.1