fixed GH #1141: Poco::StringTokenizer::TOK_TRIM changes behavior between 1.4 and 1.6

This commit is contained in:
Guenter Obiltschnig
2016-02-27 16:10:06 +01:00
parent f7ba58c80f
commit 925caa8dd3
3 changed files with 30 additions and 16 deletions

View File

@@ -68,12 +68,12 @@ public:
bool has(const std::string& token) const;
/// Returns true if token exists, false otherwise.
std::size_t find(const std::string& token, std::size_t pos = 0) const;
std::string::size_type find(const std::string& token, std::string::size_type pos = 0) const;
/// Returns the index of the first occurence of the token
/// starting at position pos.
/// Throws a NotFoundException if the token is not found.
std::size_t replace(const std::string& oldToken, const std::string& newToken, std::size_t pos = 0);
std::size_t replace(const std::string& oldToken, const std::string& newToken, std::string::size_type pos = 0);
/// Starting at position pos, replaces all subsequent tokens having value
/// equal to oldToken with newToken.
/// Returns the number of modified tokens.
@@ -88,7 +88,7 @@ private:
StringTokenizer(const StringTokenizer&);
StringTokenizer& operator = (const StringTokenizer&);
void trim (std::string& token);
void trim(std::string& token);
TokenVec _tokens;
};