From c536a979f5a213188ac54f5669ddf4b4ff48c218 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 07 9月 2019 22:13:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git

---
 src/library/base/EventRegistry.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/library/base/EventRegistry.cpp b/src/library/base/EventRegistry.cpp
index 3119afa..cd3c58f 100644
--- a/src/library/base/EventRegistry.cpp
+++ b/src/library/base/EventRegistry.cpp
@@ -51,7 +51,7 @@
 }
 
 AuditEvent const * EventRegistry::getLastFailure() const {
-	const AuditEvent* result = NULL;
+	const AuditEvent* result = nullptr;
 	if (logs.size() == 0) {
 		return result;
 	}
@@ -113,7 +113,7 @@
 }
 
 void EventRegistry::exportLastEvents(AuditEvent* auditEvents, int nlogs) {
-	int sizeToCopy = min(nlogs, (int) logs.size());
+	const int sizeToCopy = min(nlogs, (int) logs.size());
 	std::copy(logs.begin(), logs.begin() + sizeToCopy, auditEvents);
 }
 }

--
Gitblit v1.9.1