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

integrated changes from main repository for upcoming 1.2.5 release

Browse Source
This commit is contained in:
Guenter Obiltschnig
2006-10-12 15:08:28 +00:00
parent 41ee6e0ffa
commit 89111b52b3
26 changed files with 283 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Foundation/include/Poco/Configurable.h
View File

@@ -1,7 +1,7 @@
//
// Configurable.h
//
// $Id: //poco/1.2/Foundation/include/Poco/Configurable.h#1 $
// $Id: //poco/1.2/Foundation/include/Poco/Configurable.h#2 $
//
// Library: Foundation
// Package: Logging
@@ -59,6 +59,13 @@ class Foundation_API Configurable
/// Every property controls a certain aspect of a
/// Formatter or Channel. For example, the PatternFormatter's
/// formatting pattern is set via a property.
///
/// NOTE: The following property names are use internally
/// by the logging framework and must not be used by
/// channels or formatters:
/// - class
/// - pattern (Channel)
/// - formatter (Channel)
{
public:
Configurable();

4
Foundation/include/Poco/FormattingChannel.h
View File

@@ -1,7 +1,7 @@
//
// FormattingChannel.h
//
// $Id: //poco/1.2/Foundation/include/Poco/FormattingChannel.h#1 $
// $Id: //poco/1.2/Foundation/include/Poco/FormattingChannel.h#2 $
//
// Library: Foundation
// Package: Logging
@@ -94,6 +94,8 @@ public:
/// Only the "channel" and "formatter" properties are supported, which allow
/// setting the target channel and formatter, respectively, via the LoggingRegistry.
/// The "channel" and "formatter" properties are set-only.
///
/// Unsupported properties are passed to the attached Channel.
void open();
/// Opens the attached channel.

18
Foundation/include/Poco/SharedPtr.h
View File

@@ -1,7 +1,7 @@
//
// SharedPtr.h
//
// $Id: //poco/1.2/Foundation/include/Poco/SharedPtr.h#4 $
// $Id: //poco/1.2/Foundation/include/Poco/SharedPtr.h#5 $
//
// Library: Foundation
// Package: Core
@@ -133,8 +133,9 @@ public:
{
if (get() != ptr)
{
ReferenceCounter* pTmp = new ReferenceCounter;
release();
_pCounter = new ReferenceCounter;
_pCounter = pTmp;
_ptr = ptr;
}
return *this;
@@ -144,10 +145,8 @@ public:
{
if (&ptr != this)
{
release();
_pCounter = ptr._pCounter;
_pCounter->duplicate();
_ptr = const_cast<C*>(ptr.get());
SharedPtr tmp(ptr);
swap(tmp);
}
return *this;
}
@@ -157,10 +156,8 @@ public:
{
if (ptr.get() != _ptr)
{
release();
_pCounter = ptr._pCounter;
_pCounter->duplicate();
_ptr = const_cast<Other*>(ptr.get());
SharedPtr tmp(ptr);
swap(tmp);
}
return *this;
}
@@ -183,6 +180,7 @@ public:
void swap(SharedPtr& ptr)
{
std::swap(_ptr, ptr._ptr);
std::swap(_pCounter, ptr._pCounter);
}
C* operator -> ()

3
Foundation/include/Poco/ThreadPool.h
View File

@@ -1,7 +1,7 @@
//
// ThreadPool.h
//
// $Id: //poco/1.2/Foundation/include/Poco/ThreadPool.h#1 $
// $Id: //poco/1.2/Foundation/include/Poco/ThreadPool.h#2 $
//
// Library: Foundation
// Package: Threading
@@ -158,6 +158,7 @@ private:
int _maxCapacity;
int _idleTime;
int _serial;
int _age;
ThreadVec _threads;
mutable FastMutex _mutex;
};