mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-28 03:20:11 +01:00
latest changes from main rep
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// String.h
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/String.cpp#11 $
|
||||
// $Id: //poco/Main/Foundation/src/String.cpp#12 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Core
|
||||
@@ -50,11 +50,10 @@ int icompare(const std::string& str, std::string::size_type pos, std::string::si
|
||||
if (pos + n > sz) n = sz - pos;
|
||||
std::string::const_iterator it1 = str.begin() + pos;
|
||||
std::string::const_iterator end1 = str.begin() + pos + n;
|
||||
std::locale loc;
|
||||
while (it1 != end1 && it2 != end2)
|
||||
{
|
||||
std::string::value_type c1 = tolower(*it1, loc);
|
||||
std::string::value_type c2 = tolower(*it2, loc);
|
||||
std::string::value_type c1 = std::tolower(*it1);
|
||||
std::string::value_type c2 = std::tolower(*it2);
|
||||
if (c1 < c2)
|
||||
return -1;
|
||||
else if (c1 > c2)
|
||||
@@ -121,11 +120,10 @@ int icompare(const std::string& str, std::string::size_type pos, std::string::si
|
||||
if (pos + n > sz) n = sz - pos;
|
||||
std::string::const_iterator it = str.begin() + pos;
|
||||
std::string::const_iterator end = str.begin() + pos + n;
|
||||
std::locale loc;
|
||||
while (it != end && *ptr)
|
||||
{
|
||||
std::string::value_type c1 = tolower(*it, loc);
|
||||
std::string::value_type c2 = tolower(*ptr, loc);
|
||||
std::string::value_type c1 = std::tolower(*it);
|
||||
std::string::value_type c2 = std::tolower(*ptr);
|
||||
if (c1 < c2)
|
||||
return -1;
|
||||
else if (c1 > c2)
|
||||
@@ -198,7 +196,7 @@ std::string& replaceInPlace(std::string& str, const std::string::value_type* fro
|
||||
|
||||
std::string result;
|
||||
std::string::size_type pos = 0;
|
||||
std::string::size_type fromLen = strlen(from);
|
||||
std::string::size_type fromLen = std::strlen(from);
|
||||
result.append(str, 0, start);
|
||||
do
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user