From e2c2e9dc1a9a7f7eafff371cdf29bb731015238c Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 13:56:41 +0800
Subject: [PATCH] Merge pull request #69 from open-license-manager/feature/issue_licenses_42
---
src/library/base/StringUtils.h | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/library/base/StringUtils.h b/src/library/base/StringUtils.h
index dee0526..41f303a 100644
--- a/src/library/base/StringUtils.h
+++ b/src/library/base/StringUtils.h
@@ -8,12 +8,10 @@
#ifndef STRINGUTILS_H_
#define STRINGUTILS_H_
-#include <bits/types/time_t.h>
#include <string>
#include <vector>
namespace license {
-using namespace std;
/**
* Eliminate whitespace from both sides of a string and returns a copy
@@ -21,23 +19,22 @@
* @param string_to_trim
* @return the trimmed string
*/
-string trim_copy(const string& string_to_trim);
+std::string trim_copy(const std::string& string_to_trim);
-string toupper_copy(const string& lowercase);
+std::string toupper_copy(const std::string& lowercase);
time_t seconds_from_epoch(const char* s);
/**
* Split a string on a given character
*/
-const vector<string> split_string(const string& stringToBeSplit, const char splitchar);
+const std::vector<std::string> split_string(const std::string& stringToBeSplit, const char splitchar);
typedef enum {
INI, BASE64, UNKNOWN
} FILE_FORMAT;
-FILE_FORMAT identify_format(const string& license);
-
+FILE_FORMAT identify_format(const std::string& license);
}
/* namespace license */
--
Gitblit v1.9.1