From a4b1a66a4436c97efbf0dd5932e403d97f0a13d3 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 24 10月 2020 19:55:33 +0800 Subject: [PATCH] fix windows issue --- src/library/base/EventRegistry.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/library/base/EventRegistry.h b/src/library/base/EventRegistry.h index f5fec62..38b44d0 100644 --- a/src/library/base/EventRegistry.h +++ b/src/library/base/EventRegistry.h @@ -8,7 +8,8 @@ #ifndef EVENTREGISTRY_H_ #define EVENTREGISTRY_H_ -#include "../api/datatypes.h" +#include <licensecc/datatypes.h> + #include <vector> #include <map> #include <set> @@ -22,21 +23,21 @@ */ class EventRegistry { private: - friend EventRegistry& operator<<(EventRegistry&, AuditEvent&); - friend EventRegistry& operator<<(EventRegistry&, EventRegistry&); - friend std::ostream & operator << (std::ostream &out, const EventRegistry &er); + friend EventRegistry &operator<<(EventRegistry &, AuditEvent &); + friend EventRegistry &operator<<(EventRegistry &, EventRegistry &); + friend std::ostream &operator<<(std::ostream &out, const EventRegistry &er); std::vector<AuditEvent> logs; /** * For every license keep track of the events who progressed most * in the validation process */ - std::map<std::string,int> mostAdvancedLogIdx_by_LicenseId; + std::map<std::string, size_t> mostAdvancedLogIdx_by_LicenseId; int current_validation_step; public: EventRegistry(); - //operator << + // operator << void append(const EventRegistry &eventRegistry); /** * Turn the event warning for the license with the most advanced status @@ -50,11 +51,10 @@ * for the license with the most advanced status. * @return NULL if no failures are found. */ - AuditEvent const* getLastFailure() const; - void addEvent(EVENT_TYPE event, const std::string &licenseLocationId); - void addEvent(EVENT_TYPE event, const char *licenseLocationId = nullptr, - const char *info = nullptr); + const AuditEvent *getLastFailure() const; + void addEvent(LCC_EVENT_TYPE event, const std::string &licenseLocationId); + void addEvent(LCC_EVENT_TYPE event, const char *licenseLocationId = nullptr, const char *info = nullptr); void exportLastEvents(AuditEvent *auditEvents, int nlogs); }; -} +} // namespace license #endif /* EVENTREGISTRY_H_ */ -- Gitblit v1.9.1