synced with main repository

This commit is contained in:
Guenter Obiltschnig
2008-01-28 17:23:19 +00:00
parent fd1d5aed5f
commit da49971d0f
808 changed files with 1154 additions and 892 deletions

View File

@@ -1,7 +1,7 @@
//
// ASCIIEncoding.cpp
//
// $Id: //poco/Main/Foundation/src/ASCIIEncoding.cpp#12 $
// $Id: //poco/svn/Foundation/src/ASCIIEncoding.cpp#2 $
//
// Library: Foundation
// Package: Text

View File

@@ -1,7 +1,7 @@
//
// AbstractObserver.cpp
//
// $Id: //poco/Main/Foundation/src/AbstractObserver.cpp#1 $
// $Id: //poco/svn/Foundation/src/AbstractObserver.cpp#2 $
//
// Library: Foundation
// Package: Notifications

View File

@@ -1,7 +1,7 @@
//
// ActiveDispatcher.cpp
//
// $Id: //poco/Main/Foundation/src/ActiveDispatcher.cpp#5 $
// $Id: //poco/svn/Foundation/src/ActiveDispatcher.cpp#2 $
//
// Library: Foundation
// Package: Threading

View File

@@ -1,7 +1,7 @@
//
// ArchiveStrategy.cpp
//
// $Id: //poco/Main/Foundation/src/ArchiveStrategy.cpp#8 $
// $Id: //poco/svn/Foundation/src/ArchiveStrategy.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// AsyncChannel.cpp
//
// $Id: //poco/Main/Foundation/src/AsyncChannel.cpp#13 $
// $Id: //poco/svn/Foundation/src/AsyncChannel.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// AsyncIOChannel.cpp
//
// $Id: //poco/Main/Foundation/src/AsyncIOChannel.cpp#1 $
// $Id: //poco/svn/Foundation/src/AsyncIOChannel.cpp#2 $
//
// Library: Foundation
// Package: AsyncIO

View File

@@ -1,7 +1,7 @@
//
// AsyncIOCommand.cpp
//
// $Id: //poco/Main/Foundation/src/AsyncIOCommand.cpp#1 $
// $Id: //poco/svn/Foundation/src/AsyncIOCommand.cpp#2 $
//
// Library: Foundation
// Package: AsyncIO

View File

@@ -1,7 +1,7 @@
//
// AsyncIOEvent.cpp
//
// $Id: //poco/Main/Foundation/src/AsyncIOEvent.cpp#1 $
// $Id: //poco/svn/Foundation/src/AsyncIOEvent.cpp#2 $
//
// Library: Foundation
// Package: AsyncIO

View File

@@ -1,7 +1,7 @@
//
// AsyncStreamChannel.cpp
//
// $Id: //poco/Main/Foundation/src/AsyncStreamChannel.cpp#1 $
// $Id: //poco/svn/Foundation/src/AsyncStreamChannel.cpp#2 $
//
// Library: Foundation
// Package: AsyncIO

View File

@@ -1,7 +1,7 @@
//
// Base64Decoder.cpp
//
// $Id: //poco/Main/Foundation/src/Base64Decoder.cpp#15 $
// $Id: //poco/svn/Foundation/src/Base64Decoder.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// Base64Encoder.cpp
//
// $Id: //poco/Main/Foundation/src/Base64Encoder.cpp#15 $
// $Id: //poco/svn/Foundation/src/Base64Encoder.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// BinaryReader.cpp
//
// $Id: //poco/Main/Foundation/src/BinaryReader.cpp#13 $
// $Id: //poco/svn/Foundation/src/BinaryReader.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// BinaryWriter.cpp
//
// $Id: //poco/Main/Foundation/src/BinaryWriter.cpp#13 $
// $Id: //poco/svn/Foundation/src/BinaryWriter.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// Bugcheck.cpp
//
// $Id: //poco/Main/Foundation/src/Bugcheck.cpp#11 $
// $Id: //poco/svn/Foundation/src/Bugcheck.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// ByteOrder.cpp
//
// $Id: //poco/Main/Foundation/src/ByteOrder.cpp#6 $
// $Id: //poco/svn/Foundation/src/ByteOrder.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Channel.cpp
//
// $Id: //poco/Main/Foundation/src/Channel.cpp#11 $
// $Id: //poco/svn/Foundation/src/Channel.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// Checksum.cpp
//
// $Id: //poco/Main/Foundation/src/Checksum.cpp#4 $
// $Id: //poco/svn/Foundation/src/Checksum.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Condition.cpp
//
// $Id: //poco/Main/Foundation/src/Condition.cpp#1 $
// $Id: //poco/svn/Foundation/src/Condition.cpp#2 $
//
// Library: Foundation
// Package: Threading

View File

@@ -1,7 +1,7 @@
//
// Configurable.cpp
//
// $Id: //poco/Main/Foundation/src/Configurable.cpp#10 $
// $Id: //poco/svn/Foundation/src/Configurable.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// ConsoleChannel.cpp
//
// $Id: //poco/Main/Foundation/src/ConsoleChannel.cpp#10 $
// $Id: //poco/svn/Foundation/src/ConsoleChannel.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// CountingStream.cpp
//
// $Id: //poco/Main/Foundation/src/CountingStream.cpp#13 $
// $Id: //poco/svn/Foundation/src/CountingStream.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// DateTime.cpp
//
// $Id: //poco/Main/Foundation/src/DateTime.cpp#18 $
// $Id: //poco/svn/Foundation/src/DateTime.cpp#2 $
//
// Library: Foundation
// Package: DateTime

View File

@@ -1,7 +1,7 @@
//
// DateTimeFormat.cpp
//
// $Id: //poco/Main/Foundation/src/DateTimeFormat.cpp#10 $
// $Id: //poco/svn/Foundation/src/DateTimeFormat.cpp#2 $
//
// Library: Foundation
// Package: DateTime

View File

@@ -1,7 +1,7 @@
//
// DateTimeFormatter.cpp
//
// $Id: //poco/Main/Foundation/src/DateTimeFormatter.cpp#12 $
// $Id: //poco/svn/Foundation/src/DateTimeFormatter.cpp#2 $
//
// Library: Foundation
// Package: DateTime

View File

@@ -1,7 +1,7 @@
//
// DateTimeParser.cpp
//
// $Id: //poco/Main/Foundation/src/DateTimeParser.cpp#16 $
// $Id: //poco/svn/Foundation/src/DateTimeParser.cpp#3 $
//
// Library: Foundation
// Package: DateTime
@@ -154,7 +154,10 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& str, DateT
}
if (month == 0) month = 1;
if (day == 0) day = 1;
dateTime.assign(year, month, day, hour, minute, second, millis);
if (DateTime::isValid(year, month, day, hour, minute, second, millis))
dateTime.assign(year, month, day, hour, minute, second, millis);
else
throw SyntaxException("date/time component out of range");
timeZoneDifferential = tzd;
}

View File

@@ -1,7 +1,7 @@
//
// Debugger.cpp
//
// $Id: //poco/Main/Foundation/src/Debugger.cpp#15 $
// $Id: //poco/svn/Foundation/src/Debugger.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// DeflatingStream.cpp
//
// $Id: //poco/Main/Foundation/src/DeflatingStream.cpp#14 $
// $Id: //poco/svn/Foundation/src/DeflatingStream.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// DigestEngine.cpp
//
// $Id: //poco/Main/Foundation/src/DigestEngine.cpp#10 $
// $Id: //poco/svn/Foundation/src/DigestEngine.cpp#2 $
//
// Library: Foundation
// Package: Crypt

View File

@@ -1,7 +1,7 @@
//
// DigestStream.cpp
//
// $Id: //poco/Main/Foundation/src/DigestStream.cpp#13 $
// $Id: //poco/svn/Foundation/src/DigestStream.cpp#2 $
//
// Library: Foundation
// Package: Crypt

View File

@@ -1,7 +1,7 @@
//
// DirectoryIterator.cpp
//
// $Id: //poco/Main/Foundation/src/DirectoryIterator.cpp#12 $
// $Id: //poco/svn/Foundation/src/DirectoryIterator.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// DirectoryIterator_UNIX.cpp
//
// $Id: //poco/Main/Foundation/src/DirectoryIterator_UNIX.cpp#12 $
// $Id: //poco/svn/Foundation/src/DirectoryIterator_UNIX.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// DirectoryIterator_VMS.cpp
//
// $Id: //poco/Main/Foundation/src/DirectoryIterator_VMS.cpp#11 $
// $Id: //poco/svn/Foundation/src/DirectoryIterator_VMS.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// DirectoryIterator_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/DirectoryIterator_WIN32.cpp#13 $
// $Id: //poco/svn/Foundation/src/DirectoryIterator_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// DirectoryIterator_WIN32U.cpp
//
// $Id: //poco/Main/Foundation/src/DirectoryIterator_WIN32U.cpp#8 $
// $Id: //poco/svn/Foundation/src/DirectoryIterator_WIN32U.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// DynamicAny.cpp
//
// $Id: //poco/Main/Foundation/src/DynamicAny.cpp#5 $
// $Id: //poco/svn/Foundation/src/DynamicAny.cpp#3 $
//
// Library: Foundation
// Package: Core
@@ -302,7 +302,7 @@ DynamicAny DynamicAny::parse(const std::string& val, std::string::size_type& pos
skipWhiteSpace(val, pos);
if (pos < val.size())
{
switch(val[pos])
switch (val[pos])
{
case '{':
return parseObject(val, pos);
@@ -323,7 +323,7 @@ DynamicAny DynamicAny::parseObject(const std::string& val, std::string::size_typ
++pos;
skipWhiteSpace(val, pos);
DynamicStruct aStruct;
while(val[pos] != '}' && pos < val.size())
while (val[pos] != '}' && pos < val.size())
{
std::string key = parseString(val, pos);
skipWhiteSpace(val, pos);
@@ -352,7 +352,7 @@ DynamicAny DynamicAny::parseArray(const std::string& val, std::string::size_type
++pos;
skipWhiteSpace(val, pos);
std::vector<DynamicAny> result;
while(val[pos] != ']' && pos < val.size())
while (val[pos] != ']' && pos < val.size())
{
result.push_back(parse(val, pos));
skipWhiteSpace(val, pos);
@@ -382,7 +382,6 @@ std::string DynamicAny::parseString(const std::string& val, std::string::size_ty
++pos;
}
std::string::size_type stop = std::string::npos;
if (inString)
{
@@ -410,6 +409,7 @@ std::string DynamicAny::parseString(const std::string& val, std::string::size_ty
return result;
}
void DynamicAny::skipWhiteSpace(const std::string& val, std::string::size_type& pos)
{
while (std::isspace(val[pos]))

View File

@@ -1,7 +1,7 @@
//
// DynamicAnyHolder.cpp
//
// $Id: //poco/Main/Foundation/src/DynamicAnyHolder.cpp#3 $
// $Id: //poco/svn/Foundation/src/DynamicAnyHolder.cpp#3 $
//
// Library: Foundation
// Package: Core
@@ -65,4 +65,5 @@ void appendJSONString(std::string& val, const DynamicAny& any)
}
}
} // namespace Poco

View File

@@ -1,7 +1,7 @@
//
// Environment.cpp
//
// $Id: //poco/Main/Foundation/src/Environment.cpp#13 $
// $Id: //poco/svn/Foundation/src/Environment.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Environment_UNIX.cpp
//
// $Id: //poco/Main/Foundation/src/Environment_UNIX.cpp#11 $
// $Id: //poco/svn/Foundation/src/Environment_UNIX.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Environment_VMS.cpp
//
// $Id: //poco/Main/Foundation/src/Environment_VMS.cpp#11 $
// $Id: //poco/svn/Foundation/src/Environment_VMS.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Environment_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/Environment_WIN32.cpp#13 $
// $Id: //poco/svn/Foundation/src/Environment_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Environment_WIN32U.cpp
//
// $Id: //poco/Main/Foundation/src/Environment_WIN32U.cpp#9 $
// $Id: //poco/svn/Foundation/src/Environment_WIN32U.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// ErrorHandler.cpp
//
// $Id: //poco/Main/Foundation/src/ErrorHandler.cpp#6 $
// $Id: //poco/svn/Foundation/src/ErrorHandler.cpp#2 $
//
// Library: Foundation
// Package: Threading

View File

@@ -1,7 +1,7 @@
//
// Event.cpp
//
// $Id: //poco/Main/Foundation/src/Event.cpp#11 $
// $Id: //poco/svn/Foundation/src/Event.cpp#2 $
//
// Library: Foundation
// Package: Threading

View File

@@ -1,7 +1,7 @@
//
// EventArgs.cpp
//
// $Id: //poco/Main/Foundation/src/EventArgs.cpp#7 $
// $Id: //poco/svn/Foundation/src/EventArgs.cpp#2 $
//
// Library: Foundation
// Package: Events

View File

@@ -1,7 +1,7 @@
//
// EventLogChannel.cpp
//
// $Id: //poco/Main/Foundation/src/EventLogChannel.cpp#14 $
// $Id: //poco/svn/Foundation/src/EventLogChannel.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// Event_POSIX.cpp
//
// $Id: //poco/Main/Foundation/src/Event_POSIX.cpp#11 $
// $Id: //poco/svn/Foundation/src/Event_POSIX.cpp#2 $
//
// Library: Foundation
// Package: Threading

View File

@@ -1,7 +1,7 @@
//
// Event_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/Event_WIN32.cpp#13 $
// $Id: //poco/svn/Foundation/src/Event_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Threading

View File

@@ -1,7 +1,7 @@
//
// Exception.cpp
//
// $Id: //poco/Main/Foundation/src/Exception.cpp#19 $
// $Id: //poco/svn/Foundation/src/Exception.cpp#3 $
//
// Library: Foundation
// Package: Core
@@ -66,11 +66,12 @@ Exception::Exception(const std::string& msg, const Exception& nested, int code):
}
Exception::Exception(const Exception& exc): std::exception(exc)
Exception::Exception(const Exception& exc):
std::exception(exc),
_msg(exc._msg),
_code(exc._code)
{
_msg = exc._msg;
_pNested = exc._pNested ? exc._pNested->clone() : 0;
_code = exc._code;
}
@@ -85,9 +86,9 @@ Exception& Exception::operator = (const Exception& exc)
if (&exc != this)
{
delete _pNested;
_msg = exc._msg;
_msg = exc._msg;
_pNested = exc._pNested ? exc._pNested->clone() : 0;
_code = exc._code;
_code = exc._code;
}
return *this;
}

View File

@@ -1,7 +1,7 @@
//
// FPEnvironment.cpp
//
// $Id: //poco/Main/Foundation/src/FPEnvironment.cpp#17 $
// $Id: //poco/svn/Foundation/src/FPEnvironment.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// FPEnvironment_C99.cpp
//
// $Id: //poco/Main/Foundation/src/FPEnvironment_C99.cpp#13 $
// $Id: //poco/svn/Foundation/src/FPEnvironment_C99.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// FPEnvironment_DEC.cpp
//
// $Id: //poco/Main/Foundation/src/FPEnvironment_DEC.cpp#11 $
// $Id: //poco/svn/Foundation/src/FPEnvironment_DEC.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// FPEnvironment_C99.cpp
//
// $Id: //poco/Main/Foundation/src/FPEnvironment_DUMMY.cpp#5 $
// $Id: //poco/svn/Foundation/src/FPEnvironment_DUMMY.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// FPEnvironment_SUN.cpp
//
// $Id: //poco/Main/Foundation/src/FPEnvironment_SUN.cpp#9 $
// $Id: //poco/svn/Foundation/src/FPEnvironment_SUN.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// FPEnvironment_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/FPEnvironment_WIN32.cpp#11 $
// $Id: //poco/svn/Foundation/src/FPEnvironment_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// File.cpp
//
// $Id: //poco/Main/Foundation/src/File.cpp#20 $
// $Id: //poco/svn/Foundation/src/File.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// FileChannel.cpp
//
// $Id: //poco/Main/Foundation/src/FileChannel.cpp#19 $
// $Id: //poco/svn/Foundation/src/FileChannel.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// FileStream.cpp
//
// $Id: //poco/Main/Foundation/src/FileStream.cpp#8 $
// $Id: //poco/svn/Foundation/src/FileStream.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// FileStreamFactory.cpp
//
// $Id: //poco/Main/Foundation/src/FileStreamFactory.cpp#9 $
// $Id: //poco/svn/Foundation/src/FileStreamFactory.cpp#2 $
//
// Library: Foundation
// Package: URI

View File

@@ -1,7 +1,7 @@
//
// FileStream_POSIX.cpp
//
// $Id: //poco/Main/Foundation/src/FileStream_POSIX.cpp#10 $
// $Id: //poco/svn/Foundation/src/FileStream_POSIX.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// FileStream.cpp
//
// $Id: //poco/Main/Foundation/src/FileStream_WIN32.cpp#8 $
// $Id: //poco/svn/Foundation/src/FileStream_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// File_UNIX.cpp
//
// $Id: //poco/Main/Foundation/src/File_UNIX.cpp#21 $
// $Id: //poco/svn/Foundation/src/File_UNIX.cpp#3 $
//
// Library: Foundation
// Package: Filesystem
@@ -188,6 +188,16 @@ bool FileImpl::isLinkImpl() const
}
bool FileImpl::isHiddenImpl() const
{
poco_assert (!_path.empty());
Path p(_path);
p.makeFile();
return p.getFileName()[0] == '.';
}
Timestamp FileImpl::createdImpl() const
{
poco_assert (!_path.empty());

View File

@@ -1,7 +1,7 @@
//
// File_VMS.cpp
//
// $Id: //poco/Main/Foundation/src/File_VMS.cpp#15 $
// $Id: //poco/svn/Foundation/src/File_VMS.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// File_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/File_WIN32.cpp#20 $
// $Id: //poco/svn/Foundation/src/File_WIN32.cpp#3 $
//
// Library: Foundation
// Package: Filesystem
@@ -191,6 +191,17 @@ bool FileImpl::isLinkImpl() const
}
bool FileImpl::isHiddenImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == 0xFFFFFFFF)
handleLastErrorImpl(_path);
return (attr & FILE_ATTRIBUTE_HIDDEN) != 0;
}
Timestamp FileImpl::createdImpl() const
{
poco_assert (!_path.empty());

View File

@@ -1,7 +1,7 @@
//
// File_WIN32U.cpp
//
// $Id: //poco/Main/Foundation/src/File_WIN32U.cpp#13 $
// $Id: //poco/svn/Foundation/src/File_WIN32U.cpp#3 $
//
// Library: Foundation
// Package: Filesystem
@@ -195,6 +195,17 @@ bool FileImpl::isLinkImpl() const
}
bool FileImpl::isHiddenImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributesW(_upath.c_str());
if (attr == 0xFFFFFFFF)
handleLastErrorImpl(_path);
return (attr & FILE_ATTRIBUTE_HIDDEN) != 0;
}
Timestamp FileImpl::createdImpl() const
{
poco_assert (!_path.empty());

View File

@@ -1,7 +1,7 @@
//
// Format.cpp
//
// $Id: //poco/Main/Foundation/src/Format.cpp#8 $
// $Id: //poco/svn/Foundation/src/Format.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Formatter.cpp
//
// $Id: //poco/Main/Foundation/src/Formatter.cpp#10 $
// $Id: //poco/svn/Foundation/src/Formatter.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// FormattingChannel.cpp
//
// $Id: //poco/Main/Foundation/src/FormattingChannel.cpp#11 $
// $Id: //poco/svn/Foundation/src/FormattingChannel.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// Glob.cpp
//
// $Id: //poco/Main/Foundation/src/Glob.cpp#7 $
// $Id: //poco/svn/Foundation/src/Glob.cpp#2 $
//
// Library: Foundation
// Package: Filesystem

View File

@@ -1,7 +1,7 @@
//
// Hash.cpp
//
// $Id: //poco/Main/Foundation/src/Hash.cpp#4 $
// $Id: //poco/svn/Foundation/src/Hash.cpp#2 $
//
// Library: Foundation
// Package: Hashing

View File

@@ -1,7 +1,7 @@
//
// HashStatistic.cpp
//
// $Id: //poco/Main/Foundation/src/HashStatistic.cpp#7 $
// $Id: //poco/svn/Foundation/src/HashStatistic.cpp#2 $
//
// Library: Foundation
// Package: Hashing

View File

@@ -1,7 +1,7 @@
//
// HexBinaryDecoder.cpp
//
// $Id: //poco/Main/Foundation/src/HexBinaryDecoder.cpp#11 $
// $Id: //poco/svn/Foundation/src/HexBinaryDecoder.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// HexBinaryEncoder.cpp
//
// $Id: //poco/Main/Foundation/src/HexBinaryEncoder.cpp#15 $
// $Id: //poco/svn/Foundation/src/HexBinaryEncoder.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// InflatingStream.cpp
//
// $Id: //poco/Main/Foundation/src/InflatingStream.cpp#16 $
// $Id: //poco/svn/Foundation/src/InflatingStream.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// Latin1Encoding.cpp
//
// $Id: //poco/Main/Foundation/src/Latin1Encoding.cpp#12 $
// $Id: //poco/svn/Foundation/src/Latin1Encoding.cpp#2 $
//
// Library: Foundation
// Package: Text

View File

@@ -1,7 +1,7 @@
//
// Latin9Encoding.cpp
//
// $Id: //poco/Main/Foundation/src/Latin9Encoding.cpp#12 $
// $Id: //poco/svn/Foundation/src/Latin9Encoding.cpp#2 $
//
// Library: Foundation
// Package: Text

View File

@@ -1,7 +1,7 @@
//
// LineEndingConverter.cpp
//
// $Id: //poco/Main/Foundation/src/LineEndingConverter.cpp#5 $
// $Id: //poco/svn/Foundation/src/LineEndingConverter.cpp#2 $
//
// Library: Foundation
// Package: Streams

View File

@@ -1,7 +1,7 @@
//
// LocalDateTime.cpp
//
// $Id: //poco/Main/Foundation/src/LocalDateTime.cpp#12 $
// $Id: //poco/svn/Foundation/src/LocalDateTime.cpp#3 $
//
// Library: Foundation
// Package: DateTime
@@ -141,7 +141,6 @@ LocalDateTime& LocalDateTime::operator = (const Timestamp& timestamp)
_dateTime = timestamp;
determineTzd(true);
}
return *this;
}
@@ -274,7 +273,7 @@ LocalDateTime& LocalDateTime::operator -= (const Timespan& span)
}
void LocalDateTime::determineTzd (bool adjust)
void LocalDateTime::determineTzd(bool adjust)
{
std::time_t local;
std::tm broken;
@@ -293,5 +292,6 @@ void LocalDateTime::determineTzd (bool adjust)
adjustForTzd();
}
} // namespace Poco

View File

@@ -1,7 +1,7 @@
//
// LogFile.cpp
//
// $Id: //poco/Main/Foundation/src/LogFile.cpp#8 $
// $Id: //poco/svn/Foundation/src/LogFile.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LogFile_STD.cpp
//
// $Id: //poco/Main/Foundation/src/LogFile_STD.cpp#10 $
// $Id: //poco/svn/Foundation/src/LogFile_STD.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LogFile_VMS.cpp
//
// $Id: //poco/Main/Foundation/src/LogFile_VMS.cpp#7 $
// $Id: //poco/svn/Foundation/src/LogFile_VMS.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LogFile_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/LogFile_WIN32.cpp#8 $
// $Id: //poco/svn/Foundation/src/LogFile_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LogFile_WIN32U.cpp
//
// $Id: //poco/Main/Foundation/src/LogFile_WIN32U.cpp#1 $
// $Id: //poco/svn/Foundation/src/LogFile_WIN32U.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LogStream.cpp
//
// $Id: //poco/Main/Foundation/src/LogStream.cpp#4 $
// $Id: //poco/svn/Foundation/src/LogStream.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// Logger.cpp
//
// $Id: //poco/Main/Foundation/src/Logger.cpp#17 $
// $Id: //poco/svn/Foundation/src/Logger.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LoggingFactory.cpp
//
// $Id: //poco/Main/Foundation/src/LoggingFactory.cpp#8 $
// $Id: //poco/svn/Foundation/src/LoggingFactory.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// LoggingRegistry.cpp
//
// $Id: //poco/Main/Foundation/src/LoggingRegistry.cpp#7 $
// $Id: //poco/svn/Foundation/src/LoggingRegistry.cpp#2 $
//
// Library: Foundation
// Package: Logging

View File

@@ -1,7 +1,7 @@
//
// MD2Engine.cpp
//
// $Id: //poco/Main/Foundation/src/MD2Engine.cpp#12 $
// $Id: //poco/svn/Foundation/src/MD2Engine.cpp#2 $
//
// Library: Foundation
// Package: Crypt

View File

@@ -1,7 +1,7 @@
//
// MD4Engine.cpp
//
// $Id: //poco/Main/Foundation/src/MD4Engine.cpp#13 $
// $Id: //poco/svn/Foundation/src/MD4Engine.cpp#2 $
//
// Library: Foundation
// Package: Crypt

View File

@@ -1,7 +1,7 @@
//
// MD5Engine.cpp
//
// $Id: //poco/Main/Foundation/src/MD5Engine.cpp#13 $
// $Id: //poco/svn/Foundation/src/MD5Engine.cpp#2 $
//
// Library: Foundation
// Package: Crypt

Binary file not shown.

View File

@@ -1,7 +1,7 @@
//
// Manifest.cpp
//
// $Id: //poco/Main/Foundation/src/Manifest.cpp#10 $
// $Id: //poco/svn/Foundation/src/Manifest.cpp#2 $
//
// Library: Foundation
// Package: SharedLibrary

View File

@@ -1,7 +1,7 @@
//
// MemoryPool.cpp
//
// $Id: //poco/Main/Foundation/src/MemoryPool.cpp#7 $
// $Id: //poco/svn/Foundation/src/MemoryPool.cpp#2 $
//
// Library: Foundation
// Package: Core

View File

@@ -1,7 +1,7 @@
//
// Message.cpp
//
// $Id: //poco/Main/Foundation/src/Message.cpp#13 $
// $Id: //poco/svn/Foundation/src/Message.cpp#3 $
//
// Library: Foundation
// Package: Logging
@@ -66,15 +66,15 @@ Message::Message(const std::string& source, const std::string& text, Priority pr
}
Message::Message(const Message& msg)
Message::Message(const Message& msg):
_source(msg._source),
_text(msg._text),
_prio(msg._prio),
_time(msg._time),
_tid(msg._tid),
_thread(msg._thread),
_pid(msg._pid)
{
_source = msg._source;
_text = msg._text;
_prio = msg._prio;
_time = msg._time;
_thread = msg._thread;
_tid = msg._tid;
_pid = msg._pid;
if (msg._pMap)
_pMap = new StringMap(*msg._pMap);
else
@@ -82,15 +82,15 @@ Message::Message(const Message& msg)
}
Message::Message(const Message& msg, const std::string& text)
Message::Message(const Message& msg, const std::string& text):
_source(msg._source),
_text(text),
_prio(msg._prio),
_time(msg._time),
_tid(msg._tid),
_thread(msg._thread),
_pid(msg._pid)
{
_source = msg._source;
_text = text;
_prio = msg._prio;
_time = msg._time;
_thread = msg._thread;
_tid = msg._tid;
_pid = msg._pid;
if (msg._pMap)
_pMap = new StringMap(*msg._pMap);
else
@@ -134,6 +134,7 @@ void Message::swap(Message& msg)
swap(_text, msg._text);
swap(_prio, msg._prio);
swap(_time, msg._time);
swap(_tid, msg._tid);
swap(_thread, msg._thread);
swap(_pid, msg._pid);
swap(_pMap, msg._pMap);
@@ -164,12 +165,6 @@ void Message::setTime(const Timestamp& t)
}
const Timestamp& Message::getTime() const
{
return _time;
}
void Message::setThread(const std::string& thread)
{
_thread = thread;

View File

@@ -1,13 +1,13 @@
//
// Mutex.cpp
//
// $Id: //poco/Main/Foundation/src/Mutex.cpp#10 $
// $Id: //poco/svn/Foundation/src/Mutex.cpp#3 $
//
// Library: Foundation
// Package: Threading
// Module: Mutex
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// Copyright (c) 2004-2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// Permission is hereby granted, free of charge, to any person or organization

View File

@@ -1,13 +1,13 @@
//
// Mutex_POSIX.cpp
//
// $Id: //poco/Main/Foundation/src/Mutex_POSIX.cpp#11 $
// $Id: //poco/svn/Foundation/src/Mutex_POSIX.cpp#3 $
//
// Library: Foundation
// Package: Threading
// Module: Mutex
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// Copyright (c) 2004-2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// Permission is hereby granted, free of charge, to any person or organization
@@ -35,6 +35,19 @@
#include "Poco/Mutex_POSIX.h"
#include "Poco/Timestamp.h"
#if !defined(POCO_NO_SYS_SELECT_H)
#include <sys/select.h>
#endif
#include <unistd.h>
#include <sys/time.h>
#if defined(_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS - 200112L) >= 0L
#if defined(_POSIX_THREADS) && (_POSIX_THREADS - 200112L) >= 0L
#define POCO_HAVE_MUTEX_TIMEOUT
#endif
#endif
namespace Poco {
@@ -82,6 +95,48 @@ MutexImpl::~MutexImpl()
}
bool MutexImpl::tryLockImpl(long milliseconds)
{
#if defined(POCO_HAVE_MUTEX_TIMEOUT)
struct timespec abstime;
struct timeval tv;
gettimeofday(&tv, NULL);
abstime.tv_sec = tv.tv_sec + milliseconds / 1000;
abstime.tv_nsec = tv.tv_usec*1000 + (milliseconds % 1000)*1000000;
if (abstime.tv_nsec >= 1000000000)
{
abstime.tv_nsec -= 1000000000;
abstime.tv_sec++;
}
int rc = pthread_mutex_timedlock(&_mutex, &abstime);
if (rc == 0)
return true;
else if (rc == ETIMEDOUT)
return false;
else
throw SystemException("cannot lock mutex");
#else
const int sleepMillis = 5;
Timestamp now;
Timestamp::TimeDiff diff(Timestamp::TimeDiff(milliseconds)*1000);
do
{
int rc = pthread_mutex_trylock(&_mutex);
if (rc == 0)
return true;
else if (rc != EBUSY)
throw SystemException("cannot lock mutex");
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = sleepMillis * 1000;
select(0, NULL, NULL, NULL, &tv);
}
while (!now.isElapsed(diff));
return false;
#endif
}
FastMutexImpl::FastMutexImpl(): MutexImpl(true)
{
}

View File

@@ -1,7 +1,7 @@
//
// Mutex_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/Mutex_WIN32.cpp#13 $
// $Id: //poco/svn/Foundation/src/Mutex_WIN32.cpp#3 $
//
// Library: Foundation
// Package: Threading
@@ -35,6 +35,7 @@
#include "Poco/Mutex_WIN32.h"
#include "Poco/Timestamp.h"
namespace Poco {
@@ -54,4 +55,27 @@ MutexImpl::~MutexImpl()
}
bool MutexImpl::tryLockImpl(long milliseconds)
{
const int sleepMillis = 5;
Timestamp now;
Timestamp::TimeDiff diff(Timestamp::TimeDiff(milliseconds)*1000);
do
{
try
{
if (TryEnterCriticalSection(&_cs) == TRUE)
return true;
}
catch (...)
{
throw SystemException("cannot lock mutex");
}
Sleep(sleepMillis);
}
while (!now.isElapsed(diff));
return false;
}
} // namespace Poco

View File

@@ -1,7 +1,7 @@
//
// NamedEvent.cpp
//
// $Id: //poco/Main/Foundation/src/NamedEvent.cpp#9 $
// $Id: //poco/svn/Foundation/src/NamedEvent.cpp#2 $
//
// Library: Foundation
// Package: Processes

View File

@@ -1,7 +1,7 @@
//
// NamedEvent_UNIX.cpp
//
// $Id: //poco/Main/Foundation/src/NamedEvent_UNIX.cpp#14 $
// $Id: //poco/svn/Foundation/src/NamedEvent_UNIX.cpp#2 $
//
// Library: Foundation
// Package: Processes

View File

@@ -1,7 +1,7 @@
//
// NamedEvent_VMS.cpp
//
// $Id: //poco/Main/Foundation/src/NamedEvent_VMS.cpp#8 $
// $Id: //poco/svn/Foundation/src/NamedEvent_VMS.cpp#2 $
//
// Library: Foundation
// Package: Processes

View File

@@ -1,7 +1,7 @@
//
// NamedEvent_WIN32.cpp
//
// $Id: //poco/Main/Foundation/src/NamedEvent_WIN32.cpp#9 $
// $Id: //poco/svn/Foundation/src/NamedEvent_WIN32.cpp#2 $
//
// Library: Foundation
// Package: Processes

Some files were not shown because too many files have changed in this diff Show More