From b0c9c185f38c6bfc41a1d60e60aac1f7e79429dc Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周日, 01 12月 2019 14:24:31 +0800 Subject: [PATCH] fix mingw --- src/library/base/StringUtils.h | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/library/base/StringUtils.h b/src/library/base/StringUtils.h index 8134349..41f303a 100644 --- a/src/library/base/StringUtils.h +++ b/src/library/base/StringUtils.h @@ -12,7 +12,6 @@ #include <vector> namespace license { -using namespace std; /** * Eliminate whitespace from both sides of a string and returns a copy @@ -20,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