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/StringUtils.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/library/base/StringUtils.cpp b/src/library/base/StringUtils.cpp
index 3d09b99..a635b47 100644
--- a/src/library/base/StringUtils.cpp
+++ b/src/library/base/StringUtils.cpp
@@ -11,8 +11,9 @@
#include <string>
#include <cstring>
#include <algorithm>
+#include <stdexcept>
-#ifdef WIN32
+#ifdef _WIN32
#include <time.h> //mktime under windows
#endif
@@ -41,14 +42,14 @@
int year, month, day;
tm tm;
if (strlen(timeString) == 8) {
- int nfield = sscanf(timeString, "%4d%2d%2d", &year, &month, &day);
+ const int nfield = sscanf(timeString, "%4d%2d%2d", &year, &month, &day);
if (nfield != 3) {
throw invalid_argument("Date not recognized");
}
} else if (strlen(timeString) == 10) {
- int nfield = sscanf(timeString, "%4d-%2d-%2d", &year, &month, &day);
+ const int nfield = sscanf(timeString, "%4d-%2d-%2d", &year, &month, &day);
if (nfield != 3) {
- int nfield = sscanf(timeString, "%4d/%2d/%2d", &year, &month, &day);
+ const int nfield = sscanf(timeString, "%4d/%2d/%2d", &year, &month, &day);
if (nfield != 3) {
throw invalid_argument("Date not recognized");
}
--
Gitblit v1.9.1