From 3c34d8d6d83a34e3bcdb7041be1cbd784a17bbb5 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 30 11月 2019 14:56:39 +0800
Subject: [PATCH] Merge branch 'feature/issue_licenses_42' of https://github.com/open-license-manager/open-license-manager.git into feature/issue_licenses_42

---
 src/library/locate/LocatorFactory.hpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/library/locate/LocatorFactory.hpp b/src/library/locate/LocatorFactory.hpp
index 5231107..9c54b51 100644
--- a/src/library/locate/LocatorFactory.hpp
+++ b/src/library/locate/LocatorFactory.hpp
@@ -4,6 +4,7 @@
 #include <cstddef>
 #include <string>
 #include <vector>
+#include <licensecc/datatypes.h>
 
 #include "../base/base.h"
 #include "LocatorStrategy.hpp"
@@ -19,9 +20,9 @@
 	}
 public:
 
-	static FUNCTION_RETURN getActiveStrategies(
+	static FUNCTION_RETURN get_active_strategies(
 			std::vector<std::unique_ptr<LocatorStrategy>> &strategiesOut,
-			const char *locationHint);
+			const LicenseLocation *locationHint);
 
 };
 

--
Gitblit v1.9.1