integrated improvements from 1.3.4 (NumberFormatter::append(), DateTimeFormatter::append()

This commit is contained in:
Guenter Obiltschnig
2009-02-21 10:59:58 +00:00
parent 60e1433f51
commit fa1658b23a
23 changed files with 1173 additions and 598 deletions

View File

@@ -1,7 +1,7 @@
//
// IPAddress.cpp
//
// $Id: //poco/svn/Net/src/IPAddress.cpp#3 $
// $Id: //poco/Main/Net/src/IPAddress.cpp#20 $
//
// Library: Net
// Package: NetCore
@@ -117,13 +117,13 @@ public:
const UInt8* bytes = reinterpret_cast<const UInt8*>(&_addr);
std::string result;
result.reserve(16);
result.append(NumberFormatter::format(bytes[0]));
NumberFormatter::append(result, bytes[0]);
result.append(".");
result.append(NumberFormatter::format(bytes[1]));
NumberFormatter::append(result, bytes[1]);
result.append(".");
result.append(NumberFormatter::format(bytes[2]));
NumberFormatter::append(result, bytes[2]);
result.append(".");
result.append(NumberFormatter::format(bytes[3]));
NumberFormatter::append(result, bytes[3]);
return result;
}
@@ -295,13 +295,13 @@ public:
else
result.append("::FFFF:");
const UInt8* bytes = reinterpret_cast<const UInt8*>(&_addr);
result.append(NumberFormatter::format(bytes[12]));
NumberFormatter::append(result, bytes[12]);
result.append(".");
result.append(NumberFormatter::format(bytes[13]));
NumberFormatter::append(result, bytes[13]);
result.append(".");
result.append(NumberFormatter::format(bytes[14]));
NumberFormatter::append(result, bytes[14]);
result.append(".");
result.append(NumberFormatter::format(bytes[15]));
NumberFormatter::append(result, bytes[15]);
return result;
}
else
@@ -324,7 +324,7 @@ public:
}
}
if (i > 0) result.append(":");
if (i < 8) result.append(NumberFormatter::formatHex(ntohs(words[i++])));
if (i < 8) NumberFormatter::appendHex(result, ntohs(words[i++])));
}
return result;
}