generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: compile fix

Browse Source
This commit is contained in:
Marian Krivos
2011-08-23 09:20:26 +00:00
parent 321c2483f4
commit 86c574612c
4 changed files with 49 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Foundation/Makefile
View File

@@ -8,7 +8,7 @@
include $(POCO_BASE)/build/rules/global include $(POCO_BASE)/build/rules/global
objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel AtomicCounter Base64Decoder Base64Encoder \
BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \
CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \
Debugger DeflatingStream DigestEngine DigestStream DirectoryIterator \ Debugger DeflatingStream DigestEngine DigestStream DirectoryIterator \
@@ -31,7 +31,7 @@ objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder
FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1250Encoding Windows1251Encoding Windows1252Encoding \ FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1250Encoding Windows1251Encoding Windows1252Encoding \
UTF8Encoding UnicodeConverter UUID UUIDGenerator Var VarHolder Void Format \ UTF8Encoding UnicodeConverter UUID UUIDGenerator Var VarHolder Void Format \
Pipe PipeImpl PipeStream SharedMemory FileStream Unicode UTF8String \ Pipe PipeImpl PipeStream SharedMemory FileStream Unicode UTF8String \
adler32 compress crc32 deflate gclose gzlib gzread gzwrite infback inffast inflate inftrees trees uncompr zutil \ adler32 compress crc32 deflate gzclose gzlib gzread gzwrite infback inffast inflate inftrees trees uncompr zutil \
pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \ pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \
pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \ pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \
pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass

2
Foundation/src/Mutex_POSIX.cpp
View File

@@ -45,7 +45,7 @@
#include <cstring> #include <cstring>
#else #else
#include <sys/time.h> #include <sys/time.h>
#endif
#if defined(_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS - 200112L) >= 0L #if defined(_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS - 200112L) >= 0L
#if defined(_POSIX_THREADS) && (_POSIX_THREADS - 200112L) >= 0L #if defined(_POSIX_THREADS) && (_POSIX_THREADS - 200112L) >= 0L

116
Foundation/src/PatternFormatter.cpp
View File

@@ -72,30 +72,6 @@ PatternFormatter::~PatternFormatter()
} }
inline void PatternFormatter::fmt(std::string& str, int value)
{
char buffer[64];
std::sprintf(buffer, "%d", value);
str.append(buffer);
}
inline void PatternFormatter::fmt(std::string& str, int value, int width)
{
char buffer[64];
std::sprintf(buffer, "%*d", width, value);
str.append(buffer);
}
inline void PatternFormatter::fmt0(std::string& str, int value, int width)
{
char buffer[64];
std::sprintf(buffer, "%0*d", width, value);
str.append(buffer);
}
void PatternFormatter::format(const Message& msg, std::string& text) void PatternFormatter::format(const Message& msg, std::string& text)
{ {
Timestamp timestamp = msg.getTime(); Timestamp timestamp = msg.getTime();
@@ -114,45 +90,45 @@ void PatternFormatter::format(const Message& msg, std::string& text)
if (++it != end) if (++it != end)
{ {
switch (*it) switch (*it)
{ {
case 's': text.append(msg.getSource()); break; case 's': text.append(msg.getSource()); break;
case 't': text.append(msg.getText()); break; case 't': text.append(msg.getText()); break;
case 'l': NumberFormatter::append(text, (int) msg.getPriority()); break; case 'l': NumberFormatter::append(text, (int) msg.getPriority()); break;
case 'p': text.append(getPriorityName((int) msg.getPriority())); break; case 'p': text.append(getPriorityName((int) msg.getPriority())); break;
case 'q': text += getPriorityName((int) msg.getPriority()).at(0); break; case 'q': text += getPriorityName((int) msg.getPriority()).at(0); break;
case 'P': NumberFormatter::append(text, msg.getPid()); break; case 'P': NumberFormatter::append(text, msg.getPid()); break;
case 'T': text.append(msg.getThread()); break; case 'T': text.append(msg.getThread()); break;
case 'I': NumberFormatter::append(text, msg.getTid()); break; case 'I': NumberFormatter::append(text, msg.getTid()); break;
case 'N': text.append(Environment::nodeName()); break; case 'N': text.append(Environment::nodeName()); break;
case 'U': text.append(msg.getSourceFile() ? msg.getSourceFile() : ""); break; case 'U': text.append(msg.getSourceFile() ? msg.getSourceFile() : ""); break;
case 'u': NumberFormatter::append(text, msg.getSourceLine()); break; case 'u': NumberFormatter::append(text, msg.getSourceLine()); break;
case 'w': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()], 0, 3); break; case 'w': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()], 0, 3); break;
case 'W': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()]); break; case 'W': text.append(DateTimeFormat::WEEKDAY_NAMES[dateTime.dayOfWeek()]); break;
case 'b': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1], 0, 3); break; case 'b': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1], 0, 3); break;
case 'B': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1]); break; case 'B': text.append(DateTimeFormat::MONTH_NAMES[dateTime.month() - 1]); break;
case 'd': NumberFormatter::append0(text, dateTime.day(), 2); break; case 'd': NumberFormatter::append0(text, dateTime.day(), 2); break;
case 'e': NumberFormatter::append(text, dateTime.day()); break; case 'e': NumberFormatter::append(text, dateTime.day()); break;
case 'f': NumberFormatter::append(text, dateTime.day(), 2); break; case 'f': NumberFormatter::append(text, dateTime.day(), 2); break;
case 'm': NumberFormatter::append0(text, dateTime.month(), 2); break; case 'm': NumberFormatter::append0(text, dateTime.month(), 2); break;
case 'n': NumberFormatter::append(text, dateTime.month()); break; case 'n': NumberFormatter::append(text, dateTime.month()); break;
case 'o': NumberFormatter::append(text, dateTime.month(), 2); break; case 'o': NumberFormatter::append(text, dateTime.month(), 2); break;
case 'y': NumberFormatter::append0(text, dateTime.year() % 100, 2); break; case 'y': NumberFormatter::append0(text, dateTime.year() % 100, 2); break;
case 'Y': NumberFormatter::append0(text, dateTime.year(), 4); break; case 'Y': NumberFormatter::append0(text, dateTime.year(), 4); break;
case 'H': NumberFormatter::append0(text, dateTime.hour(), 2); break; case 'H': NumberFormatter::append0(text, dateTime.hour(), 2); break;
case 'h': NumberFormatter::append0(text, dateTime.hourAMPM(), 2); break; case 'h': NumberFormatter::append0(text, dateTime.hourAMPM(), 2); break;
case 'a': text.append(dateTime.isAM() ? "am" : "pm"); break; case 'a': text.append(dateTime.isAM() ? "am" : "pm"); break;
case 'A': text.append(dateTime.isAM() ? "AM" : "PM"); break; case 'A': text.append(dateTime.isAM() ? "AM" : "PM"); break;
case 'M': NumberFormatter::append0(text, dateTime.minute(), 2); break; case 'M': NumberFormatter::append0(text, dateTime.minute(), 2); break;
case 'S': NumberFormatter::append0(text, dateTime.second(), 2); break; case 'S': NumberFormatter::append0(text, dateTime.second(), 2); break;
case 'i': NumberFormatter::append0(text, dateTime.millisecond(), 3); break; case 'i': NumberFormatter::append0(text, dateTime.millisecond(), 3); break;
case 'c': NumberFormatter::append(text, dateTime.millisecond()/100); break; case 'c': NumberFormatter::append(text, dateTime.millisecond()/100); break;
case 'F': NumberFormatter::append0(text, dateTime.millisecond()*1000 + dateTime.microsecond(), 6); break; case 'F': NumberFormatter::append0(text, dateTime.millisecond()*1000 + dateTime.microsecond(), 6); break;
case 'z': text.append(DateTimeFormatter::tzdISO(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break; case 'z': text.append(DateTimeFormatter::tzdISO(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break;
case 'Z': text.append(DateTimeFormatter::tzdRFC(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break; case 'Z': text.append(DateTimeFormatter::tzdRFC(_localTime ? Timezone::tzd() : DateTimeFormatter::UTC)); break;
case 'E': NumberFormatter::append(text, msg.getTime().epochTime()); break; case 'E': NumberFormatter::append(text, msg.getTime().epochTime()); break;
case '[': case '[':
{ {
++it; ++it;
std::string prop; std::string prop;
while (it != end && *it != ']') prop += *it++; while (it != end && *it != ']') prop += *it++;
if (it == end) --it; if (it == end) --it;
@@ -199,8 +175,8 @@ std::string PatternFormatter::getProperty(const std::string& name) const
namespace namespace
{ {
static std::string priorities[] = static std::string priorities[] =
{ {
"", "",
"Fatal", "Fatal",
"Critical", "Critical",
@@ -208,16 +184,16 @@ namespace
"Warning", "Warning",
"Notice", "Notice",
"Information", "Information",
"Debug", "Debug",
"Trace" "Trace"
}; };
} }
const std::string& PatternFormatter::getPriorityName(int prio) const std::string& PatternFormatter::getPriorityName(int prio)
{ {
poco_assert (1 <= prio && prio <= 8); poco_assert (1 <= prio && prio <= 8);
return priorities[prio]; return priorities[prio];
} }

16
Foundation/src/Unicode.cpp
View File

@@ -56,22 +56,6 @@ void Unicode::properties(int ch, CharacterProperties& props)
} }
bool Unicode::isLower(int ch)
{
CharacterProperties props;
properties(ch, props);
return props.category == UCP_LETTER && props.type == UCP_LOWER_CASE_LETTER;
}
bool Unicode::isUpper(int ch)
{
CharacterProperties props;
properties(ch, props);
return props.category == UCP_LETTER && props.type == UCP_UPPER_CASE_LETTER;
}
int Unicode::toLower(int ch) int Unicode::toLower(int ch)
{ {
if (isUpper(ch)) if (isUpper(ch))