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/ApplicationFolder.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.hpp b/src/library/locate/ApplicationFolder.hpp
index b98182e..3e2163d 100644
--- a/src/library/locate/ApplicationFolder.hpp
+++ b/src/library/locate/ApplicationFolder.hpp
@@ -15,14 +15,14 @@
namespace license {
namespace locate {
-class ApplicationFolder: public LocatorStrategy {
+class ApplicationFolder : public LocatorStrategy {
public:
ApplicationFolder();
- virtual const std::vector<std::string> licenseLocations(EventRegistry& eventRegistry) const;
+ const virtual std::vector<std::string> license_locations(EventRegistry& eventRegistry);
virtual ~ApplicationFolder();
};
-}
+} // namespace locate
} /* namespace license */
#endif /* SRC_LIBRARY_RETRIEVERS_APPLICATIONFOLDER_H_ */
--
Gitblit v1.9.1