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/license++.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/library/license++.cpp b/src/library/license++.cpp
index fd07af8..f9cc7c7 100644
--- a/src/library/license++.cpp
+++ b/src/library/license++.cpp
@@ -23,7 +23,7 @@
static void mergeLicenses(vector<license::FullLicenseInfo> licenses,
LicenseInfo* license) {
- if (license != NULL) {
+ if (license != nullptr) {
time_t curLicense_exp = 0;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
//choose the license that expires later...
@@ -68,7 +68,7 @@
} else {
result = er.getLastFailure()->event_type;
}
- if (license != NULL) {
+ if (license != nullptr) {
er.exportLastEvents(license->status, 5);
}
return result;
--
Gitblit v1.9.1