From f6437cfaed1dd0acd1ec63e1c282d0e7edfa4522 Mon Sep 17 00:00:00 2001
From: davidwed <davidwe@posteo.de>
Date: 周六, 07 9月 2019 21:54:13 +0800
Subject: [PATCH] Fix a compilier error with msys2-mingw64 ( ld.exe: cannot find -ldl ) (#35)
---
src/library/base/StringUtils.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/library/base/StringUtils.cpp b/src/library/base/StringUtils.cpp
index 14b9bc6..a635b47 100644
--- a/src/library/base/StringUtils.cpp
+++ b/src/library/base/StringUtils.cpp
@@ -2,7 +2,7 @@
* StringUtils.cpp
*
* Created on: Apr 8, 2014
- * Author: devel
+ *
*/
#include <cctype> //toupper
@@ -11,6 +11,11 @@
#include <string>
#include <cstring>
#include <algorithm>
+#include <stdexcept>
+
+#ifdef _WIN32
+#include <time.h> //mktime under windows
+#endif
namespace license {
using namespace std;
@@ -37,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