generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +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

24
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();

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))