synchronized trunk

This commit is contained in:
Guenter Obiltschnig
2007-08-10 13:57:07 +00:00
parent 2ef3a4f9d2
commit a04bae94d7
63 changed files with 2735 additions and 352 deletions

View File

@@ -1,7 +1,7 @@
//
// String.h
//
// $Id: //poco/Main/Foundation/include/Poco/String.h#7 $
// $Id: //poco/Main/Foundation/include/Poco/String.h#8 $
//
// Library: Foundation
// Package: Core
@@ -202,8 +202,8 @@ int icompare(
It end1 = str.begin() + pos + n;
while (it1 != end1 && it2 != end2)
{
typename S::value_type c1 = std::tolower(*it1);
typename S::value_type c2 = std::tolower(*it2);
typename S::value_type c1(std::tolower(*it1));
typename S::value_type c2(std::tolower(*it2));
if (c1 < c2)
return -1;
else if (c1 > c2)
@@ -294,8 +294,8 @@ int icompare(
typename S::const_iterator end = str.begin() + pos + n;
while (it != end && *ptr)
{
typename S::value_type c1 = std::tolower(*it);
typename S::value_type c2 = std::tolower(*ptr);
typename S::value_type c1(std::tolower(*it));
typename S::value_type c2(std::tolower(*ptr));
if (c1 < c2)
return -1;
else if (c1 > c2)