diff --git a/Foundation/include/Poco/AccessExpirationDecorator.h b/Foundation/include/Poco/AccessExpirationDecorator.h
index 552663c04..a1938875a 100644
--- a/Foundation/include/Poco/AccessExpirationDecorator.h
+++ b/Foundation/include/Poco/AccessExpirationDecorator.h
@@ -1,105 +1,105 @@
-//
-// AccessExpirationDecorator.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpirationDecorator.h#2 $
-//
-// Library: Foundation
-// Package: Events
-// Module:  AccessExpirationDecorator
-//
-// Implementation of the AccessExpirationDecorator template.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_AccessExpirationDecorator_INCLUDED
-#define  Foundation_AccessExpirationDecorator_INCLUDED
-
-
-#include "Poco/Timestamp.h"
-#include "Poco/Timespan.h"
-
-
-namespace Poco {
-
-
-template <typename TArgs>
-class AccessExpirationDecorator
-	/// AccessExpirationDecorator adds an expiration method to values so that they can be used
-	/// with the UniqueAccessExpireCache
-{
-public:
-	AccessExpirationDecorator():
-		_value(),
-		_span()
-	{
-	}
-
-	AccessExpirationDecorator(const TArgs& p, const Poco::Timespan::TimeDiff& diffInMs):
-			/// Creates an element that will expire in diff milliseconds
-		_value(p),
-		_span(diffInMs*1000)
-	{
-	}
-
-	AccessExpirationDecorator(const TArgs& p, const Poco::Timespan& timeSpan):
-		/// Creates an element that will expire after the given timeSpan
-		_value(p),
-		_span(timeSpan)
-	{
-	}
-
-
-	~AccessExpirationDecorator()
-	{
-	}
-	
-	const Poco::Timespan& getTimeout() const
-	{
-		return _span;
-	}
-
-	const TArgs& value() const
-	{
-		return _value;
-	}
-
-	TArgs& value()
-	{
-		return _value;
-	}
-
-private:
-	TArgs     _value;
-	Timespan  _span;
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// AccessExpirationDecorator.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AccessExpirationDecorator.h#2 $
+//
+// Library: Foundation
+// Package: Events
+// Module:  AccessExpirationDecorator
+//
+// Implementation of the AccessExpirationDecorator template.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_AccessExpirationDecorator_INCLUDED
+#define  Foundation_AccessExpirationDecorator_INCLUDED
+
+
+#include "Poco/Timestamp.h"
+#include "Poco/Timespan.h"
+
+
+namespace Poco {
+
+
+template <typename TArgs>
+class AccessExpirationDecorator
+	/// AccessExpirationDecorator adds an expiration method to values so that they can be used
+	/// with the UniqueAccessExpireCache
+{
+public:
+	AccessExpirationDecorator():
+		_value(),
+		_span()
+	{
+	}
+
+	AccessExpirationDecorator(const TArgs& p, const Poco::Timespan::TimeDiff& diffInMs):
+			/// Creates an element that will expire in diff milliseconds
+		_value(p),
+		_span(diffInMs*1000)
+	{
+	}
+
+	AccessExpirationDecorator(const TArgs& p, const Poco::Timespan& timeSpan):
+		/// Creates an element that will expire after the given timeSpan
+		_value(p),
+		_span(timeSpan)
+	{
+	}
+
+
+	~AccessExpirationDecorator()
+	{
+	}
+	
+	const Poco::Timespan& getTimeout() const
+	{
+		return _span;
+	}
+
+	const TArgs& value() const
+	{
+		return _value;
+	}
+
+	TArgs& value()
+	{
+		return _value;
+	}
+
+private:
+	TArgs     _value;
+	Timespan  _span;
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/AccessExpireCache.h b/Foundation/include/Poco/AccessExpireCache.h
index 0034507ab..dee5bdf37 100644
--- a/Foundation/include/Poco/AccessExpireCache.h
+++ b/Foundation/include/Poco/AccessExpireCache.h
@@ -1,80 +1,80 @@
-//
-// AccessExpireCache.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpireCache.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  AccessExpireCache
-//
-// Definition of the AccessExpireCache class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_AccessExpireCache_INCLUDED
-#define  Foundation_AccessExpireCache_INCLUDED
-
-
-#include "Poco/AbstractCache.h"
-#include "Poco/AccessExpireStrategy.h"
-
-
-namespace Poco {
-
-
-template <class TKey, class TValue> 
-class AccessExpireCache: public AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue> >
-	/// An AccessExpireCache caches entries for a fixed time period (per default 10 minutes).
-	/// Entries expire when they are not accessed with get() during this time period. Each access resets
-	/// the start time for expiration.
-	/// Be careful when using an AccessExpireCache. A cache is often used
-	/// like cache.has(x) followed by cache.get x). Note that it could happen
-	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
-	/// when "get" is invoked.
-{
-public:
-	AccessExpireCache(Timestamp::TimeDiff expire = 600000): 
-		AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue> >(AccessExpireStrategy<TKey, TValue>(expire))
-	{
-	}
-
-	~AccessExpireCache()
-	{
-	}
-
-private:
-	AccessExpireCache(const AccessExpireCache& aCache);
-	AccessExpireCache& operator = (const AccessExpireCache& aCache);
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// AccessExpireCache.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AccessExpireCache.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  AccessExpireCache
+//
+// Definition of the AccessExpireCache class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_AccessExpireCache_INCLUDED
+#define  Foundation_AccessExpireCache_INCLUDED
+
+
+#include "Poco/AbstractCache.h"
+#include "Poco/AccessExpireStrategy.h"
+
+
+namespace Poco {
+
+
+template <class TKey, class TValue> 
+class AccessExpireCache: public AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue> >
+	/// An AccessExpireCache caches entries for a fixed time period (per default 10 minutes).
+	/// Entries expire when they are not accessed with get() during this time period. Each access resets
+	/// the start time for expiration.
+	/// Be careful when using an AccessExpireCache. A cache is often used
+	/// like cache.has(x) followed by cache.get x). Note that it could happen
+	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// when "get" is invoked.
+{
+public:
+	AccessExpireCache(Timestamp::TimeDiff expire = 600000): 
+		AbstractCache<TKey, TValue, AccessExpireStrategy<TKey, TValue> >(AccessExpireStrategy<TKey, TValue>(expire))
+	{
+	}
+
+	~AccessExpireCache()
+	{
+	}
+
+private:
+	AccessExpireCache(const AccessExpireCache& aCache);
+	AccessExpireCache& operator = (const AccessExpireCache& aCache);
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/AccessExpireLRUCache.h b/Foundation/include/Poco/AccessExpireLRUCache.h
index 8da3698ce..39f138c54 100644
--- a/Foundation/include/Poco/AccessExpireLRUCache.h
+++ b/Foundation/include/Poco/AccessExpireLRUCache.h
@@ -1,82 +1,82 @@
-//
-// AccessExpireLRUCache.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpireLRUCache.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  AccessExpireLRUCache
-//
-// Definition of the AccessExpireLRUCache class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_AccessExpireLRUCache_INCLUDED
-#define  Foundation_AccessExpireLRUCache_INCLUDED
-
-
-#include "Poco/AbstractCache.h"
-#include "Poco/StrategyCollection.h"
-#include "Poco/AccessExpireStrategy.h"
-#include "Poco/LRUStrategy.h"
-
-
-namespace Poco {
-
-
-template < 
-	class TKey,
-	class TValue
->
-class AccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >
-	/// An AccessExpireLRUCache combines LRU caching and time based expire caching.
-	/// It cache entries for a fixed time period (per default 10 minutes)
-	/// but also limits the size of the cache (per default: 1024).
-{
-public:
-	AccessExpireLRUCache(long cacheSize = 1024, Timestamp::TimeDiff expire = 600000): 
-		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >(StrategyCollection<TKey, TValue>())
-	{
-		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
-		this->_strategy.pushBack(new AccessExpireStrategy<TKey, TValue>(expire));
-	}
-
-	~AccessExpireLRUCache()
-	{
-	}
-
-private:
-	AccessExpireLRUCache(const AccessExpireLRUCache& aCache);
-	AccessExpireLRUCache& operator = (const AccessExpireLRUCache& aCache);
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// AccessExpireLRUCache.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AccessExpireLRUCache.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  AccessExpireLRUCache
+//
+// Definition of the AccessExpireLRUCache class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_AccessExpireLRUCache_INCLUDED
+#define  Foundation_AccessExpireLRUCache_INCLUDED
+
+
+#include "Poco/AbstractCache.h"
+#include "Poco/StrategyCollection.h"
+#include "Poco/AccessExpireStrategy.h"
+#include "Poco/LRUStrategy.h"
+
+
+namespace Poco {
+
+
+template < 
+	class TKey,
+	class TValue
+>
+class AccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >
+	/// An AccessExpireLRUCache combines LRU caching and time based expire caching.
+	/// It cache entries for a fixed time period (per default 10 minutes)
+	/// but also limits the size of the cache (per default: 1024).
+{
+public:
+	AccessExpireLRUCache(long cacheSize = 1024, Timestamp::TimeDiff expire = 600000): 
+		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >(StrategyCollection<TKey, TValue>())
+	{
+		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
+		this->_strategy.pushBack(new AccessExpireStrategy<TKey, TValue>(expire));
+	}
+
+	~AccessExpireLRUCache()
+	{
+	}
+
+private:
+	AccessExpireLRUCache(const AccessExpireLRUCache& aCache);
+	AccessExpireLRUCache& operator = (const AccessExpireLRUCache& aCache);
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/AccessExpireStrategy.h b/Foundation/include/Poco/AccessExpireStrategy.h
index b362486e9..060e0e563 100644
--- a/Foundation/include/Poco/AccessExpireStrategy.h
+++ b/Foundation/include/Poco/AccessExpireStrategy.h
@@ -1,93 +1,93 @@
-//
-// AccessExpireStrategy.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AccessExpireStrategy.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  AccessExpireStrategy
-//
-// Definition of the AccessExpireStrategy class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_AccessExpireStrategy_INCLUDED
-#define  Foundation_AccessExpireStrategy_INCLUDED
-
-
-#include "Poco/KeyValueArgs.h"
-#include "Poco/ValidArgs.h"
-#include "Poco/ExpireStrategy.h"
-#include "Poco/Bugcheck.h"
-#include "Poco/Timestamp.h"
-#include "Poco/EventArgs.h"
-#include <set>
-#include <map>
-
-
-namespace Poco {
-
-
-template < 
-	class TKey,
-	class TValue
->
-class AccessExpireStrategy: public ExpireStrategy<TKey, TValue>
-	/// An AccessExpireStrategy implements time and access based expiration of cache entries
-{
-public:
-	AccessExpireStrategy(Timestamp::TimeDiff expireTimeInMilliSec): ExpireStrategy<TKey, TValue>(expireTimeInMilliSec)
-		/// Create an expire strategy. Note that the smallest allowed caching time is 25ms.
-		/// Anything lower than that is not useful with current operating systems.
-	{
-	}
-
-	~AccessExpireStrategy()
-	{
-	}
-
-	void onGet(const void*, const TKey& key)
-	{
-		// get triggers an update to the expiration time
-		typename ExpireStrategy<TKey, TValue>::Iterator it = this->_keys.find(key);
-		if (it != this->_keys.end())
-		{
-			this->_keyIndex.erase(it->second);
-			Timestamp now;
-			typename ExpireStrategy<TKey, TValue>::IndexIterator itIdx =
-				this->_keyIndex.insert(typename ExpireStrategy<TKey, TValue>::TimeIndex::value_type(now, key));
-			it->second = itIdx;
-		}
-	}
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// AccessExpireStrategy.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AccessExpireStrategy.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  AccessExpireStrategy
+//
+// Definition of the AccessExpireStrategy class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_AccessExpireStrategy_INCLUDED
+#define  Foundation_AccessExpireStrategy_INCLUDED
+
+
+#include "Poco/KeyValueArgs.h"
+#include "Poco/ValidArgs.h"
+#include "Poco/ExpireStrategy.h"
+#include "Poco/Bugcheck.h"
+#include "Poco/Timestamp.h"
+#include "Poco/EventArgs.h"
+#include <set>
+#include <map>
+
+
+namespace Poco {
+
+
+template < 
+	class TKey,
+	class TValue
+>
+class AccessExpireStrategy: public ExpireStrategy<TKey, TValue>
+	/// An AccessExpireStrategy implements time and access based expiration of cache entries
+{
+public:
+	AccessExpireStrategy(Timestamp::TimeDiff expireTimeInMilliSec): ExpireStrategy<TKey, TValue>(expireTimeInMilliSec)
+		/// Create an expire strategy. Note that the smallest allowed caching time is 25ms.
+		/// Anything lower than that is not useful with current operating systems.
+	{
+	}
+
+	~AccessExpireStrategy()
+	{
+	}
+
+	void onGet(const void*, const TKey& key)
+	{
+		// get triggers an update to the expiration time
+		typename ExpireStrategy<TKey, TValue>::Iterator it = this->_keys.find(key);
+		if (it != this->_keys.end())
+		{
+			this->_keyIndex.erase(it->second);
+			Timestamp now;
+			typename ExpireStrategy<TKey, TValue>::IndexIterator itIdx =
+				this->_keyIndex.insert(typename ExpireStrategy<TKey, TValue>::TimeIndex::value_type(now, key));
+			it->second = itIdx;
+		}
+	}
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/AsyncIOChannel.h b/Foundation/include/Poco/AsyncIOChannel.h
index 790535798..3d642235a 100644
--- a/Foundation/include/Poco/AsyncIOChannel.h
+++ b/Foundation/include/Poco/AsyncIOChannel.h
@@ -1,154 +1,154 @@
-//
-// AsyncIOChannel.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AsyncIOChannel.h#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncIOChannel
-//
-// Definition of the AsyncIOChannel class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_AsyncIOChannel_INCLUDED
-#define Foundation_AsyncIOChannel_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/ActiveDispatcher.h"
-#include "Poco/ActiveMethod.h"
-#include "Poco/AsyncIOCommand.h"
-
-
-namespace Poco {
-
-
-class Foundation_API AsyncIOChannel: public ActiveDispatcher
-	/// AsyncIOChannel supports asynchronous I/O operations on
-	/// streams or other input/output facilities.
-	///
-	/// This implementation of asynchronous I/O is based on
-	/// blocking I/O operations that are executed in a separate thread.
-	/// Some operating systems may provide special asynchronous
-	/// I/O operations at the operating system level. However, these
-	/// are not used by the current implementation.
-	///
-	/// I/O operations (in the form of AsyncIOCommand subclass instances)
-	/// are queued for execution on an AsyncIOChannel. The AsyncIOChannel's
-	/// I/O thread executes all queued commands in FIFO order.
-	///
-	/// Since AsyncIOChannel is based on ActiveDispatcher, the I/O thread is
-	/// taken from the default thread pool. It should be ensured that the
-	/// capacity of the default thread pool is sufficient before using
-	/// asynchronous I/O. For every AsyncIOChannel instance, one thread
-	/// from the default thread pool is needed.
-	///
-	/// Subclasses of AsyncIOChannel implement asynchronous input/output
-	/// for streams and sockets.
-	///
-	/// The enqueue() active member function is used to enqueue AsyncIOCommand
-	/// instances for execution.
-	///
-	/// The cancel() member function (inherited from ActiveDispatcher) can be
-	/// used to cancel all pending requests.
-	///
-	/// Both the AsyncIOCommand class, and the AsyncIOChannel class offer events
-	/// that notify an interested party about the successful or unsuccessful
-	/// completion of a command.
-	///
-	/// There are also two ways to wait for the completion of a command and
-	/// obtain its result. The first one is by using the return value of
-	/// enqueue(), which is ActiveResult<int>. See the ActiveResult class
-	/// template for more information. The second one is by using the functions
-	/// of AsyncIOCommand, such as wait(), succeeded() and result().
-	///
-	/// AsyncIOChannel supports the operations write, read and seek directly. However,
-	/// subclasses of AsyncIOChannel can define additional operations.
-{
-public:
-	ActiveMethod<int, AsyncIOCommand::Ptr, AsyncIOChannel, ActiveStarter<ActiveDispatcher> > enqueue;
-		/// Actual signature: 
-		///     int enqueueImpl(const AsyncIOCommand::Ptr& pCommand);
-		///
-		/// Enqueue the given command for eventual execution.
-		/// Returns the number of bytes read or written if the operation
-		/// was successful.
-
-	BasicEvent<AsyncIOEvent> commandCompleted;
-		/// Fired when a command has successfully completed.
-		
-	BasicEvent<AsyncIOEvent> commandFailed;
-		/// Fired when a command has failed.
-
-	virtual int write(const void* buffer, int length);
-		/// Write length bytes from buffer. 
-		///
-		/// Must be overridden by subclasses. The default implementation 
-		/// throws a NotImplementedException.
-		///
-		/// Returns the number of bytes written.
-		
-	virtual int read(void* buffer, int length);
-		/// Read up to length bytes into buffer. 
-		///
-		/// Must be overridden by subclasses. The default implementation 
-		/// throws a NotImplementedException.
-		///
-		/// Returns the number of bytes read.
-		
-	virtual int seek(std::streamoff off, std::ios::seekdir dir);
-		/// Sets the current read/write position.
-		/// 
-		/// Must be overridden by subclasses. The default implementation 
-		/// throws a NotImplementedException.
-		///
-		/// Always returns 0.
-		
-protected:
-	AsyncIOChannel();
-		/// Creates the AsyncIOChannel.
-		
-	~AsyncIOChannel();
-		/// Destroys the AsyncIOChannel.
-	
-	int enqueueImpl(const AsyncIOCommand::Ptr& pCommand);
-		/// Execute the given command by calling
-		///     pCommand->execute(this);
-		/// and return the result.
-	
-private:
-	AsyncIOChannel(const AsyncIOChannel&);
-	AsyncIOChannel& operator = (const AsyncIOChannel&);
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_AsyncIOChannel_INCLUDED
+//
+// AsyncIOChannel.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AsyncIOChannel.h#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncIOChannel
+//
+// Definition of the AsyncIOChannel class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_AsyncIOChannel_INCLUDED
+#define Foundation_AsyncIOChannel_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/ActiveDispatcher.h"
+#include "Poco/ActiveMethod.h"
+#include "Poco/AsyncIOCommand.h"
+
+
+namespace Poco {
+
+
+class Foundation_API AsyncIOChannel: public ActiveDispatcher
+	/// AsyncIOChannel supports asynchronous I/O operations on
+	/// streams or other input/output facilities.
+	///
+	/// This implementation of asynchronous I/O is based on
+	/// blocking I/O operations that are executed in a separate thread.
+	/// Some operating systems may provide special asynchronous
+	/// I/O operations at the operating system level. However, these
+	/// are not used by the current implementation.
+	///
+	/// I/O operations (in the form of AsyncIOCommand subclass instances)
+	/// are queued for execution on an AsyncIOChannel. The AsyncIOChannel's
+	/// I/O thread executes all queued commands in FIFO order.
+	///
+	/// Since AsyncIOChannel is based on ActiveDispatcher, the I/O thread is
+	/// taken from the default thread pool. It should be ensured that the
+	/// capacity of the default thread pool is sufficient before using
+	/// asynchronous I/O. For every AsyncIOChannel instance, one thread
+	/// from the default thread pool is needed.
+	///
+	/// Subclasses of AsyncIOChannel implement asynchronous input/output
+	/// for streams and sockets.
+	///
+	/// The enqueue() active member function is used to enqueue AsyncIOCommand
+	/// instances for execution.
+	///
+	/// The cancel() member function (inherited from ActiveDispatcher) can be
+	/// used to cancel all pending requests.
+	///
+	/// Both the AsyncIOCommand class, and the AsyncIOChannel class offer events
+	/// that notify an interested party about the successful or unsuccessful
+	/// completion of a command.
+	///
+	/// There are also two ways to wait for the completion of a command and
+	/// obtain its result. The first one is by using the return value of
+	/// enqueue(), which is ActiveResult<int>. See the ActiveResult class
+	/// template for more information. The second one is by using the functions
+	/// of AsyncIOCommand, such as wait(), succeeded() and result().
+	///
+	/// AsyncIOChannel supports the operations write, read and seek directly. However,
+	/// subclasses of AsyncIOChannel can define additional operations.
+{
+public:
+	ActiveMethod<int, AsyncIOCommand::Ptr, AsyncIOChannel, ActiveStarter<ActiveDispatcher> > enqueue;
+		/// Actual signature: 
+		///     int enqueueImpl(const AsyncIOCommand::Ptr& pCommand);
+		///
+		/// Enqueue the given command for eventual execution.
+		/// Returns the number of bytes read or written if the operation
+		/// was successful.
+
+	BasicEvent<AsyncIOEvent> commandCompleted;
+		/// Fired when a command has successfully completed.
+		
+	BasicEvent<AsyncIOEvent> commandFailed;
+		/// Fired when a command has failed.
+
+	virtual int write(const void* buffer, int length);
+		/// Write length bytes from buffer. 
+		///
+		/// Must be overridden by subclasses. The default implementation 
+		/// throws a NotImplementedException.
+		///
+		/// Returns the number of bytes written.
+		
+	virtual int read(void* buffer, int length);
+		/// Read up to length bytes into buffer. 
+		///
+		/// Must be overridden by subclasses. The default implementation 
+		/// throws a NotImplementedException.
+		///
+		/// Returns the number of bytes read.
+		
+	virtual int seek(std::streamoff off, std::ios::seekdir dir);
+		/// Sets the current read/write position.
+		/// 
+		/// Must be overridden by subclasses. The default implementation 
+		/// throws a NotImplementedException.
+		///
+		/// Always returns 0.
+		
+protected:
+	AsyncIOChannel();
+		/// Creates the AsyncIOChannel.
+		
+	~AsyncIOChannel();
+		/// Destroys the AsyncIOChannel.
+	
+	int enqueueImpl(const AsyncIOCommand::Ptr& pCommand);
+		/// Execute the given command by calling
+		///     pCommand->execute(this);
+		/// and return the result.
+	
+private:
+	AsyncIOChannel(const AsyncIOChannel&);
+	AsyncIOChannel& operator = (const AsyncIOChannel&);
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_AsyncIOChannel_INCLUDED
diff --git a/Foundation/include/Poco/AsyncIOCommand.h b/Foundation/include/Poco/AsyncIOCommand.h
index da78eed86..28a5cbe43 100644
--- a/Foundation/include/Poco/AsyncIOCommand.h
+++ b/Foundation/include/Poco/AsyncIOCommand.h
@@ -1,319 +1,319 @@
-//
-// AsyncIOCommand.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AsyncIOCommand.h#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncIOCommand
-//
-// Definition of the AsyncIOCommand class and subclasses.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_AsyncIOCommand_INCLUDED
-#define Foundation_AsyncIOCommand_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/AutoPtr.h"
-#include "Poco/Event.h"
-#include "Poco/BasicEvent.h"
-#include "Poco/AsyncIOEvent.h"
-#include "Poco/Exception.h"
-#include <ios>
-
-
-namespace Poco {
-
-
-class AsyncIOChannel;
-
-
-class Foundation_API AsyncIOCommand: public RefCountedObject
-	/// AsyncIOCommand is the base class for all asynchronous input/output
-	/// commands used with AsyncIOChannel.
-	///
-	/// See class AsyncIOChannel for more information about asynchronous input/output.
-{
-public:
-	typedef AutoPtr<AsyncIOCommand> Ptr;
-	
-	enum State
-	{
-		CMD_PENDING,     /// Command is queued for execution.
-		CMD_IN_PROGRESS, /// Command is currently being executed.
-		CMD_COMPLETED,   /// Command has completed successfully.
-		CMD_FAILED       /// Command has failed.
-	};
-	
-	BasicEvent<AsyncIOEvent> commandCompleted;
-		/// Fired when the command has successfully completed.
-		
-	BasicEvent<AsyncIOEvent> commandFailed;
-		/// Fired when the command has failed.
-	
-	State state() const;
-		/// Returns the current state of the command.
-	
-	void wait();
-		/// Waits for the completion of the command.
-	
-	void wait(long milliseconds);
-		/// Waits at most the given timeout for the 
-		/// completion of the command. Throws a
-		/// TimeoutException if the command does
-		/// not complete within the given timeout.
-		
-	bool tryWait(long milliseconds);
-		/// Waits at most the given timeout for the 
-		/// completion of the command. 
-		///
-		/// Returns true if the command completes within
-		/// the given timeout, otherwise false.
-		
-	bool succeeded() const;
-		/// Returns true iff the command completed successfully.
-		
-	bool failed() const;
-		/// Returns true iff the command has completed with an error.
-		
-	const Exception* exception() const;
-		/// If the command failed with an exception, returns a
-		/// clone of the exception. Otherwise, returns a null pointer.
-		
-	int execute(AsyncIOChannel& channel);
-		/// Executes the command on the given AsyncIOChannel.
-		///
-		/// Sets the state to CMD_IN_PROGRESS, calls
-		/// executeImpl(), and, according to its result,
-		/// sets the state to CMD_COMPLETED or CMD_FAILED
-		/// and signals the event.
-		///
-		/// Returns the number of bytes processed by the
-		/// command.
-		
-	int result() const;
-		/// Returns the result of the command.
-		
-protected:
-	AsyncIOCommand();
-		/// Creates the AsyncIOCommand.
-		
-	~AsyncIOCommand();
-		/// Destroys the AsyncIOCommand.
-	
-	virtual int executeImpl(AsyncIOChannel& channel) = 0;
-		/// Executes the command on the given AsyncIOChannel.
-		/// Must be overridded by subclasses.
-		///
-		/// Returns the number of bytes processed by the
-		/// command.
-
-private:
-	State _state;
-	Event _completed;
-	int _result;
-	Exception* _pException;
-};
-
-
-class Foundation_API AsyncWriteCommand: public AsyncIOCommand
-	/// An asynchronous write command.
-{
-public:
-	AsyncWriteCommand(const void* buffer, int length);
-		/// Create an AsyncWriteCommand for writing length bytes
-		/// from the given buffer. The given buffer must be
-		/// valid until the command completes.
-
-	const void* buffer() const;
-		/// Returns the buffer's address.
-		
-	int length() const;
-		/// Returns the buffer's size.
-
-protected:
-	int executeImpl(AsyncIOChannel& channel);
-	~AsyncWriteCommand();
-	
-private:
-	AsyncWriteCommand();
-	
-	const void* _buffer;
-	int _length;
-};
-
-
-class Foundation_API AsyncBufferedWriteCommand: public AsyncWriteCommand
-	/// An asynchronous write command. The difference to
-	/// AsyncWriteCommand is that AsyncBufferedWriteCommand 
-	/// copies the data in the buffer into an internal buffer, thus
-	/// the given buffer can be deleted as soon as the constructor
-	/// returns.
-{
-public:
-	AsyncBufferedWriteCommand(const void* buffer, int length);
-		/// Create an AsyncBufferedWriteCommand for writing length bytes
-		/// from the given buffer and copies the data from the
-		/// given buffer into an internal buffer.
-		///
-		/// The internal buffer can be accessed via the buffer()
-		/// member function inherited from AsyncWriteCommand.
-
-protected:
-	~AsyncBufferedWriteCommand();
-};
-
-
-class Foundation_API AsyncReadCommand: public AsyncIOCommand
-	/// An asynchronous read command.
-{
-public:
-	AsyncReadCommand(void* buffer, int length);
-		/// Create an AsyncReadCommand for reading up to length
-		/// bytes into the given buffer.
-
-	void* buffer() const;
-		/// Returns the buffer's address.
-		
-	int length() const;
-		/// Returns the buffer's size.
-
-protected:
-	int executeImpl(AsyncIOChannel& channel);
-	~AsyncReadCommand();
-	
-private:
-	AsyncReadCommand();
-	
-	void* _buffer;
-	int _length;
-};
-
-
-class Foundation_API AsyncBufferedReadCommand: public AsyncReadCommand
-	/// An asynchronous read command. In contrast to
-	/// AsyncReadCommand, which requires an externally supplied
-	/// buffer that must be valid until the command completes,
-	/// AsyncBufferedReadCommand maintains an internal buffer.
-{
-public:
-	AsyncBufferedReadCommand(int length);
-		/// Create an AsyncReadCommand for reading up to length
-		/// bytes into an internal buffer.
-		///
-		/// The buffer can be accessed via the buffer() member
-		/// function inherited from AsyncReadCommand.
-
-protected:
-	~AsyncBufferedReadCommand();
-};
-
-
-class Foundation_API AsyncSeekCommand: public AsyncIOCommand
-	/// An asynchronous seek command.
-{
-public:
-	AsyncSeekCommand(std::streamoff off, std::ios::seekdir dir = std::ios::beg);
-		/// Creates an AsyncSeekCommand for setting the current read/write position.
-
-protected:
-	int executeImpl(AsyncIOChannel& channel);
-	~AsyncSeekCommand();
-	
-private:
-	AsyncSeekCommand();
-	
-	std::streamoff _off;
-	std::ios::seekdir _dir;
-};
-
-
-//
-// inlines
-//
-inline AsyncIOCommand::State AsyncIOCommand::state() const
-{
-	return _state;
-}
-
-
-inline int AsyncIOCommand::result() const
-{
-	return _result;
-}
-
-
-inline const Exception* AsyncIOCommand::exception() const
-{
-	return _pException;
-}
-
-
-inline bool AsyncIOCommand::succeeded() const
-{
-	return _state == CMD_COMPLETED;
-}
-
-
-inline bool AsyncIOCommand::failed() const
-{
-	return _state == CMD_FAILED;
-}
-
-
-inline const void* AsyncWriteCommand::buffer() const
-{
-	return _buffer;
-}
-
-
-inline int AsyncWriteCommand::length() const
-{
-	return _length;
-}
-
-
-inline void* AsyncReadCommand::buffer() const
-{
-	return _buffer;
-}
-
-
-inline int AsyncReadCommand::length() const
-{
-	return _length;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_AsyncIOCommand_INCLUDED
+//
+// AsyncIOCommand.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AsyncIOCommand.h#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncIOCommand
+//
+// Definition of the AsyncIOCommand class and subclasses.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_AsyncIOCommand_INCLUDED
+#define Foundation_AsyncIOCommand_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/RefCountedObject.h"
+#include "Poco/AutoPtr.h"
+#include "Poco/Event.h"
+#include "Poco/BasicEvent.h"
+#include "Poco/AsyncIOEvent.h"
+#include "Poco/Exception.h"
+#include <ios>
+
+
+namespace Poco {
+
+
+class AsyncIOChannel;
+
+
+class Foundation_API AsyncIOCommand: public RefCountedObject
+	/// AsyncIOCommand is the base class for all asynchronous input/output
+	/// commands used with AsyncIOChannel.
+	///
+	/// See class AsyncIOChannel for more information about asynchronous input/output.
+{
+public:
+	typedef AutoPtr<AsyncIOCommand> Ptr;
+	
+	enum State
+	{
+		CMD_PENDING,     /// Command is queued for execution.
+		CMD_IN_PROGRESS, /// Command is currently being executed.
+		CMD_COMPLETED,   /// Command has completed successfully.
+		CMD_FAILED       /// Command has failed.
+	};
+	
+	BasicEvent<AsyncIOEvent> commandCompleted;
+		/// Fired when the command has successfully completed.
+		
+	BasicEvent<AsyncIOEvent> commandFailed;
+		/// Fired when the command has failed.
+	
+	State state() const;
+		/// Returns the current state of the command.
+	
+	void wait();
+		/// Waits for the completion of the command.
+	
+	void wait(long milliseconds);
+		/// Waits at most the given timeout for the 
+		/// completion of the command. Throws a
+		/// TimeoutException if the command does
+		/// not complete within the given timeout.
+		
+	bool tryWait(long milliseconds);
+		/// Waits at most the given timeout for the 
+		/// completion of the command. 
+		///
+		/// Returns true if the command completes within
+		/// the given timeout, otherwise false.
+		
+	bool succeeded() const;
+		/// Returns true iff the command completed successfully.
+		
+	bool failed() const;
+		/// Returns true iff the command has completed with an error.
+		
+	const Exception* exception() const;
+		/// If the command failed with an exception, returns a
+		/// clone of the exception. Otherwise, returns a null pointer.
+		
+	int execute(AsyncIOChannel& channel);
+		/// Executes the command on the given AsyncIOChannel.
+		///
+		/// Sets the state to CMD_IN_PROGRESS, calls
+		/// executeImpl(), and, according to its result,
+		/// sets the state to CMD_COMPLETED or CMD_FAILED
+		/// and signals the event.
+		///
+		/// Returns the number of bytes processed by the
+		/// command.
+		
+	int result() const;
+		/// Returns the result of the command.
+		
+protected:
+	AsyncIOCommand();
+		/// Creates the AsyncIOCommand.
+		
+	~AsyncIOCommand();
+		/// Destroys the AsyncIOCommand.
+	
+	virtual int executeImpl(AsyncIOChannel& channel) = 0;
+		/// Executes the command on the given AsyncIOChannel.
+		/// Must be overridded by subclasses.
+		///
+		/// Returns the number of bytes processed by the
+		/// command.
+
+private:
+	State _state;
+	Event _completed;
+	int _result;
+	Exception* _pException;
+};
+
+
+class Foundation_API AsyncWriteCommand: public AsyncIOCommand
+	/// An asynchronous write command.
+{
+public:
+	AsyncWriteCommand(const void* buffer, int length);
+		/// Create an AsyncWriteCommand for writing length bytes
+		/// from the given buffer. The given buffer must be
+		/// valid until the command completes.
+
+	const void* buffer() const;
+		/// Returns the buffer's address.
+		
+	int length() const;
+		/// Returns the buffer's size.
+
+protected:
+	int executeImpl(AsyncIOChannel& channel);
+	~AsyncWriteCommand();
+	
+private:
+	AsyncWriteCommand();
+	
+	const void* _buffer;
+	int _length;
+};
+
+
+class Foundation_API AsyncBufferedWriteCommand: public AsyncWriteCommand
+	/// An asynchronous write command. The difference to
+	/// AsyncWriteCommand is that AsyncBufferedWriteCommand 
+	/// copies the data in the buffer into an internal buffer, thus
+	/// the given buffer can be deleted as soon as the constructor
+	/// returns.
+{
+public:
+	AsyncBufferedWriteCommand(const void* buffer, int length);
+		/// Create an AsyncBufferedWriteCommand for writing length bytes
+		/// from the given buffer and copies the data from the
+		/// given buffer into an internal buffer.
+		///
+		/// The internal buffer can be accessed via the buffer()
+		/// member function inherited from AsyncWriteCommand.
+
+protected:
+	~AsyncBufferedWriteCommand();
+};
+
+
+class Foundation_API AsyncReadCommand: public AsyncIOCommand
+	/// An asynchronous read command.
+{
+public:
+	AsyncReadCommand(void* buffer, int length);
+		/// Create an AsyncReadCommand for reading up to length
+		/// bytes into the given buffer.
+
+	void* buffer() const;
+		/// Returns the buffer's address.
+		
+	int length() const;
+		/// Returns the buffer's size.
+
+protected:
+	int executeImpl(AsyncIOChannel& channel);
+	~AsyncReadCommand();
+	
+private:
+	AsyncReadCommand();
+	
+	void* _buffer;
+	int _length;
+};
+
+
+class Foundation_API AsyncBufferedReadCommand: public AsyncReadCommand
+	/// An asynchronous read command. In contrast to
+	/// AsyncReadCommand, which requires an externally supplied
+	/// buffer that must be valid until the command completes,
+	/// AsyncBufferedReadCommand maintains an internal buffer.
+{
+public:
+	AsyncBufferedReadCommand(int length);
+		/// Create an AsyncReadCommand for reading up to length
+		/// bytes into an internal buffer.
+		///
+		/// The buffer can be accessed via the buffer() member
+		/// function inherited from AsyncReadCommand.
+
+protected:
+	~AsyncBufferedReadCommand();
+};
+
+
+class Foundation_API AsyncSeekCommand: public AsyncIOCommand
+	/// An asynchronous seek command.
+{
+public:
+	AsyncSeekCommand(std::streamoff off, std::ios::seekdir dir = std::ios::beg);
+		/// Creates an AsyncSeekCommand for setting the current read/write position.
+
+protected:
+	int executeImpl(AsyncIOChannel& channel);
+	~AsyncSeekCommand();
+	
+private:
+	AsyncSeekCommand();
+	
+	std::streamoff _off;
+	std::ios::seekdir _dir;
+};
+
+
+//
+// inlines
+//
+inline AsyncIOCommand::State AsyncIOCommand::state() const
+{
+	return _state;
+}
+
+
+inline int AsyncIOCommand::result() const
+{
+	return _result;
+}
+
+
+inline const Exception* AsyncIOCommand::exception() const
+{
+	return _pException;
+}
+
+
+inline bool AsyncIOCommand::succeeded() const
+{
+	return _state == CMD_COMPLETED;
+}
+
+
+inline bool AsyncIOCommand::failed() const
+{
+	return _state == CMD_FAILED;
+}
+
+
+inline const void* AsyncWriteCommand::buffer() const
+{
+	return _buffer;
+}
+
+
+inline int AsyncWriteCommand::length() const
+{
+	return _length;
+}
+
+
+inline void* AsyncReadCommand::buffer() const
+{
+	return _buffer;
+}
+
+
+inline int AsyncReadCommand::length() const
+{
+	return _length;
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_AsyncIOCommand_INCLUDED
diff --git a/Foundation/include/Poco/AsyncIOEvent.h b/Foundation/include/Poco/AsyncIOEvent.h
index 4c5b01d5a..4c32a3867 100644
--- a/Foundation/include/Poco/AsyncIOEvent.h
+++ b/Foundation/include/Poco/AsyncIOEvent.h
@@ -1,121 +1,121 @@
-//
-// AsyncIOEvent.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AsyncIOEvent.h#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncIOEvent
-//
-// Definition of the AsyncIOEvent class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_AsyncIOEvent_INCLUDED
-#define Foundation_AsyncIOEvent_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-namespace Poco {
-
-
-class AsyncIOCommand;
-class AsyncIOChannel;
-
-
-class Foundation_API AsyncIOEvent
-	/// The AsyncIOEvent class holds information about an event
-	/// caused by asynchronous input or output operation.
-{
-public:
-	enum EventKind
-	{
-		EV_COMMAND_COMPLETED,
-		EV_COMMAND_FAILED
-	};
-	
-	AsyncIOEvent(AsyncIOCommand* pCommand, AsyncIOChannel* pChannel, EventKind what);
-		/// Creates the AsyncIOEvent.
-
-	AsyncIOEvent(const AsyncIOEvent& event);
-		/// Creates a AsyncIOEvent from another one.
-
-	~AsyncIOEvent();
-		/// Destroys the AsyncIOEvent.
-		
-	AsyncIOEvent& operator = (const AsyncIOEvent& event);
-		/// Assigns a AsyncIOEvent.
-		
-	void swap(AsyncIOEvent& event);
-		/// Swaps the event with another one.
-		
-	AsyncIOCommand& command() const;
-		/// Returns the command that caused the event.
-		
-	AsyncIOChannel& channel() const;
-		/// Returns the channel that caused the event.
-		
-	EventKind what() const;
-		/// Returns the reason of the event.
-
-private:
-	AsyncIOEvent();
-	
-	AsyncIOCommand* _pCommand;
-	AsyncIOChannel* _pChannel;
-	EventKind       _what;
-};
-
-
-//
-// inlines
-//
-inline AsyncIOCommand& AsyncIOEvent::command() const
-{
-	return *_pCommand;
-}
-
-
-inline AsyncIOChannel& AsyncIOEvent::channel() const
-{
-	return *_pChannel;
-}
-
-
-inline AsyncIOEvent::EventKind AsyncIOEvent::what() const
-{
-	return _what;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_AsyncIOEvent_INCLUDED
+//
+// AsyncIOEvent.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AsyncIOEvent.h#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncIOEvent
+//
+// Definition of the AsyncIOEvent class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_AsyncIOEvent_INCLUDED
+#define Foundation_AsyncIOEvent_INCLUDED
+
+
+#include "Poco/Foundation.h"
+
+
+namespace Poco {
+
+
+class AsyncIOCommand;
+class AsyncIOChannel;
+
+
+class Foundation_API AsyncIOEvent
+	/// The AsyncIOEvent class holds information about an event
+	/// caused by asynchronous input or output operation.
+{
+public:
+	enum EventKind
+	{
+		EV_COMMAND_COMPLETED,
+		EV_COMMAND_FAILED
+	};
+	
+	AsyncIOEvent(AsyncIOCommand* pCommand, AsyncIOChannel* pChannel, EventKind what);
+		/// Creates the AsyncIOEvent.
+
+	AsyncIOEvent(const AsyncIOEvent& event);
+		/// Creates a AsyncIOEvent from another one.
+
+	~AsyncIOEvent();
+		/// Destroys the AsyncIOEvent.
+		
+	AsyncIOEvent& operator = (const AsyncIOEvent& event);
+		/// Assigns a AsyncIOEvent.
+		
+	void swap(AsyncIOEvent& event);
+		/// Swaps the event with another one.
+		
+	AsyncIOCommand& command() const;
+		/// Returns the command that caused the event.
+		
+	AsyncIOChannel& channel() const;
+		/// Returns the channel that caused the event.
+		
+	EventKind what() const;
+		/// Returns the reason of the event.
+
+private:
+	AsyncIOEvent();
+	
+	AsyncIOCommand* _pCommand;
+	AsyncIOChannel* _pChannel;
+	EventKind       _what;
+};
+
+
+//
+// inlines
+//
+inline AsyncIOCommand& AsyncIOEvent::command() const
+{
+	return *_pCommand;
+}
+
+
+inline AsyncIOChannel& AsyncIOEvent::channel() const
+{
+	return *_pChannel;
+}
+
+
+inline AsyncIOEvent::EventKind AsyncIOEvent::what() const
+{
+	return _what;
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_AsyncIOEvent_INCLUDED
diff --git a/Foundation/include/Poco/AsyncStreamChannel.h b/Foundation/include/Poco/AsyncStreamChannel.h
index 7f6503f44..ddaacdc2f 100644
--- a/Foundation/include/Poco/AsyncStreamChannel.h
+++ b/Foundation/include/Poco/AsyncStreamChannel.h
@@ -1,96 +1,96 @@
-//
-// AsyncStreamChannel.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/AsyncStreamChannel.h#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncStreamChannel
-//
-// Definition of the AsyncStreamChannel class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_AsyncStreamChannel_INCLUDED
-#define Foundation_AsyncStreamChannel_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/AsyncIOChannel.h"
-#include <istream>
-#include <ostream>
-#include <iostream>
-
-
-namespace Poco {
-
-
-class Foundation_API AsyncStreamChannel: public AsyncIOChannel
-	/// AsyncStreamChannel provides an AsyncIOChannel for I/O streams.
-	///
-	/// Usage Example:
-	///     std::stringstream str;
-	///     AsyncStreamChannel channel(str);
-	///     channel.enqueue(new AsyncWriteCommand("Hello", 5));
-	///     channel.enqueue(new AsyncWriteCommand(", ", 2));
-	///     ActiveResult<int> result = channel.enqueue(new AsyncWriteCommand("world!", 6));
-	///     result.wait();
-	///     std::string s(str.str());
-{
-public:
-	AsyncStreamChannel(std::istream& istr);
-		/// Creates an AsyncStreamChannel using the given input stream.
-		/// Only read and seek operations will be allowed.
-		
-	AsyncStreamChannel(std::ostream& ostr);
-		/// Creates an AsyncStreamChannel using the given output stream.
-		/// Only write and seek operations will be allowed.
-
-	AsyncStreamChannel(std::iostream& iostr);
-		/// Creates an AsyncStreamChannel using the given input/output stream.
-
-	~AsyncStreamChannel();
-		/// Destroys the AsyncStreamChannel.
-	
-	// AsyncIOChannel
-	int write(const void* buffer, int length);
-	int read(void* buffer, int length);
-	int seek(std::streamoff off, std::ios::seekdir dir);
-			
-private:
-	AsyncStreamChannel();
-	
-	std::istream* _pIstr;
-	std::ostream* _pOstr;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_AsyncStreamChannel_INCLUDED
+//
+// AsyncStreamChannel.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/AsyncStreamChannel.h#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncStreamChannel
+//
+// Definition of the AsyncStreamChannel class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_AsyncStreamChannel_INCLUDED
+#define Foundation_AsyncStreamChannel_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/AsyncIOChannel.h"
+#include <istream>
+#include <ostream>
+#include <iostream>
+
+
+namespace Poco {
+
+
+class Foundation_API AsyncStreamChannel: public AsyncIOChannel
+	/// AsyncStreamChannel provides an AsyncIOChannel for I/O streams.
+	///
+	/// Usage Example:
+	///     std::stringstream str;
+	///     AsyncStreamChannel channel(str);
+	///     channel.enqueue(new AsyncWriteCommand("Hello", 5));
+	///     channel.enqueue(new AsyncWriteCommand(", ", 2));
+	///     ActiveResult<int> result = channel.enqueue(new AsyncWriteCommand("world!", 6));
+	///     result.wait();
+	///     std::string s(str.str());
+{
+public:
+	AsyncStreamChannel(std::istream& istr);
+		/// Creates an AsyncStreamChannel using the given input stream.
+		/// Only read and seek operations will be allowed.
+		
+	AsyncStreamChannel(std::ostream& ostr);
+		/// Creates an AsyncStreamChannel using the given output stream.
+		/// Only write and seek operations will be allowed.
+
+	AsyncStreamChannel(std::iostream& iostr);
+		/// Creates an AsyncStreamChannel using the given input/output stream.
+
+	~AsyncStreamChannel();
+		/// Destroys the AsyncStreamChannel.
+	
+	// AsyncIOChannel
+	int write(const void* buffer, int length);
+	int read(void* buffer, int length);
+	int seek(std::streamoff off, std::ios::seekdir dir);
+			
+private:
+	AsyncStreamChannel();
+	
+	std::istream* _pIstr;
+	std::ostream* _pOstr;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_AsyncStreamChannel_INCLUDED
diff --git a/Foundation/include/Poco/Checksum.h b/Foundation/include/Poco/Checksum.h
index c49a28f3e..c3c6e2190 100644
--- a/Foundation/include/Poco/Checksum.h
+++ b/Foundation/include/Poco/Checksum.h
@@ -1,130 +1,130 @@
-//
-// Checksum.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/Checksum.h#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  Checksum
-//
-// Definition of the Checksum class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_Checksum_INCLUDED
-#define Foundation_Checksum_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-namespace Poco {
-
-
-class Foundation_API Checksum
-	/// This class calculates CRC-32 or Adler-32 checksums
-	/// for arbitrary data.
-	///
-	/// A cyclic redundancy check (CRC) is a type of hash function, which is used to produce a 
-	/// small, fixed-size checksum of a larger block of data, such as a packet of network 
-	/// traffic or a computer file. CRC-32 is one of the most commonly used CRC algorithms.
-	///
-	/// Adler-32 is a checksum algorithm which was invented by Mark Adler. 
-	/// It is almost as reliable as a 32-bit cyclic redundancy check for protecting against 
-	/// accidental modification of data, such as distortions occurring during a transmission, 
-	/// but is significantly faster to calculate in software.
-	
-{
-public:
-	enum Type
-	{
-		TYPE_ADLER32 = 0,
-		TYPE_CRC32
-	};
-
-	Checksum();
-		/// Creates a CRC-32 checksum initialized to 0.
-
-	Checksum(Type t);
-		/// Creates the Checksum, using the given type.
-
-	~Checksum();
-		/// Destroys the Checksum.
-
-	void update(const char* data, unsigned length);
-		/// Updates the checksum with the given data.
-
-	void update(const std::string& data);
-		/// Updates the checksum with the given data.
-
-	void update(char data);
-		/// Updates the checksum with the given data.
-
-	Poco::UInt32 checksum() const;
-		/// Returns the calculated checksum.
-
-	Type type() const;
-		/// Which type of checksum are we calulcating
-
-private:
-	Type         _type;
-	Poco::UInt32 _value;
-};
-
-
-//
-// inlines
-//
-inline void Checksum::update(const std::string& data)
-{
-	update(data.c_str(), static_cast<unsigned int>(data.size()));
-}
-
-
-inline void Checksum::update(char c)
-{
-	update(&c, 1);
-}
-
-
-inline Poco::UInt32 Checksum::checksum() const
-{
-	return _value;
-}
-
-
-inline Checksum::Type Checksum::type() const
-{
-	return _type;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Checksum_INCLUDED
+//
+// Checksum.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/Checksum.h#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  Checksum
+//
+// Definition of the Checksum class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_Checksum_INCLUDED
+#define Foundation_Checksum_INCLUDED
+
+
+#include "Poco/Foundation.h"
+
+
+namespace Poco {
+
+
+class Foundation_API Checksum
+	/// This class calculates CRC-32 or Adler-32 checksums
+	/// for arbitrary data.
+	///
+	/// A cyclic redundancy check (CRC) is a type of hash function, which is used to produce a 
+	/// small, fixed-size checksum of a larger block of data, such as a packet of network 
+	/// traffic or a computer file. CRC-32 is one of the most commonly used CRC algorithms.
+	///
+	/// Adler-32 is a checksum algorithm which was invented by Mark Adler. 
+	/// It is almost as reliable as a 32-bit cyclic redundancy check for protecting against 
+	/// accidental modification of data, such as distortions occurring during a transmission, 
+	/// but is significantly faster to calculate in software.
+	
+{
+public:
+	enum Type
+	{
+		TYPE_ADLER32 = 0,
+		TYPE_CRC32
+	};
+
+	Checksum();
+		/// Creates a CRC-32 checksum initialized to 0.
+
+	Checksum(Type t);
+		/// Creates the Checksum, using the given type.
+
+	~Checksum();
+		/// Destroys the Checksum.
+
+	void update(const char* data, unsigned length);
+		/// Updates the checksum with the given data.
+
+	void update(const std::string& data);
+		/// Updates the checksum with the given data.
+
+	void update(char data);
+		/// Updates the checksum with the given data.
+
+	Poco::UInt32 checksum() const;
+		/// Returns the calculated checksum.
+
+	Type type() const;
+		/// Which type of checksum are we calulcating
+
+private:
+	Type         _type;
+	Poco::UInt32 _value;
+};
+
+
+//
+// inlines
+//
+inline void Checksum::update(const std::string& data)
+{
+	update(data.c_str(), static_cast<unsigned int>(data.size()));
+}
+
+
+inline void Checksum::update(char c)
+{
+	update(&c, 1);
+}
+
+
+inline Poco::UInt32 Checksum::checksum() const
+{
+	return _value;
+}
+
+
+inline Checksum::Type Checksum::type() const
+{
+	return _type;
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_Checksum_INCLUDED
diff --git a/Foundation/include/Poco/Condition.h b/Foundation/include/Poco/Condition.h
index 12a8c637a..3d5a47305 100644
--- a/Foundation/include/Poco/Condition.h
+++ b/Foundation/include/Poco/Condition.h
@@ -1,159 +1,159 @@
-//
-// Condition.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/Condition.h#2 $
-//
-// Library: Foundation
-// Package: Threading
-// Module:  Condition
-//
-// Definition of the Condition class template.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_Condition_INCLUDED
-#define Foundation_Condition_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/Mutex.h"
-#include "Poco/ScopedUnlock.h"
-#include "Poco/Event.h"
-#include "Poco/Exception.h"
-#include <deque>
-
-
-namespace Poco {
-
-
-class Foundation_API Condition
-	/// A Condition is a synchronization object used to block a thread 
-	/// until a particular condition is met. 
-	/// A Condition object is always used in conjunction with
-	/// a Mutex (or FastMutex) object.
-	///
-	/// Condition objects are similar to POSIX condition variables, which the
-	/// difference that Condition is not subject to spurious wakeups.
-	///
-	/// Threads waiting on a Condition are resumed in FIFO order.
-{
-public:
-	Condition();
-		/// Creates the Condition.
-	
-	~Condition();
-		/// Destroys the Condition.
-	
-	template <class Mtx>
-	void wait(Mtx& mutex)
-		/// Unlocks the mutex (which must be locked upon calling
-		/// wait()) and waits until the Condition is signalled.
-		///
-		/// The given mutex will be locked again upon 
-		/// leaving the function, even in case of an exception.
-	{
-		ScopedUnlock<Mtx> unlock(mutex, false);
-		Event event;
-		{
-			FastMutex::ScopedLock lock(_mutex);
-			mutex.unlock();
-			enqueue(event);
-		}
-		event.wait();
-	}
-	
-	template <class Mtx>
-	void wait(Mtx& mutex, long milliseconds)
-		/// Unlocks the mutex (which must be locked upon calling
-		/// wait()) and waits for the given time until the Condition is signalled.
-		///
-		/// The given mutex will be locked again upon successfully leaving the 
-		/// function, even in case of an exception.
-		///
-		/// Throws a TimeoutException if the Condition is not signalled
-		/// within the given time interval.
-	{
-		if (!tryWait(mutex, milliseconds))
-			throw TimeoutException();
-	}
-	
-	template <class Mtx>
-	bool tryWait(Mtx& mutex, long milliseconds)
-		/// Unlocks the mutex (which must be locked upon calling
-		/// tryWait()) and waits for the given time until the Condition is signalled.
-		///
-		/// The given mutex will be locked again upon leaving the 
-		/// function, even in case of an exception.
-		///
-		/// Returns true if the Condition has been signalled
-		/// within the given time interval, otherwise false.
-	{
-		ScopedUnlock<Mtx> unlock(mutex, false);
-		Event event;
-		{
-			FastMutex::ScopedLock lock(_mutex);
-			mutex.unlock();
-			enqueue(event);
-		}
-		if (!event.tryWait(milliseconds))
-		{
-			FastMutex::ScopedLock lock(_mutex);
-			dequeue(event);
-			return false;
-		}
-		return true;
-	}
-	
-	void signal();
-		/// Signals the Condition and allows one waiting thread
-		/// to continue execution.
-
-	void broadcast();
-		/// Signals the Condition and allows all waiting
-		/// threads to continue their execution.
-
-protected:
-	void enqueue(Event& event);
-	void dequeue();
-	void dequeue(Event& event);
-	
-private:
-	Condition(const Condition&);
-	Condition& operator = (const Condition&);
-	
-	typedef std::deque<Event*> WaitQueue;
-	
-	FastMutex _mutex;
-	WaitQueue _waitQueue;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Condition_INCLUDED
+//
+// Condition.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/Condition.h#2 $
+//
+// Library: Foundation
+// Package: Threading
+// Module:  Condition
+//
+// Definition of the Condition class template.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_Condition_INCLUDED
+#define Foundation_Condition_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/Mutex.h"
+#include "Poco/ScopedUnlock.h"
+#include "Poco/Event.h"
+#include "Poco/Exception.h"
+#include <deque>
+
+
+namespace Poco {
+
+
+class Foundation_API Condition
+	/// A Condition is a synchronization object used to block a thread 
+	/// until a particular condition is met. 
+	/// A Condition object is always used in conjunction with
+	/// a Mutex (or FastMutex) object.
+	///
+	/// Condition objects are similar to POSIX condition variables, which the
+	/// difference that Condition is not subject to spurious wakeups.
+	///
+	/// Threads waiting on a Condition are resumed in FIFO order.
+{
+public:
+	Condition();
+		/// Creates the Condition.
+	
+	~Condition();
+		/// Destroys the Condition.
+	
+	template <class Mtx>
+	void wait(Mtx& mutex)
+		/// Unlocks the mutex (which must be locked upon calling
+		/// wait()) and waits until the Condition is signalled.
+		///
+		/// The given mutex will be locked again upon 
+		/// leaving the function, even in case of an exception.
+	{
+		ScopedUnlock<Mtx> unlock(mutex, false);
+		Event event;
+		{
+			FastMutex::ScopedLock lock(_mutex);
+			mutex.unlock();
+			enqueue(event);
+		}
+		event.wait();
+	}
+	
+	template <class Mtx>
+	void wait(Mtx& mutex, long milliseconds)
+		/// Unlocks the mutex (which must be locked upon calling
+		/// wait()) and waits for the given time until the Condition is signalled.
+		///
+		/// The given mutex will be locked again upon successfully leaving the 
+		/// function, even in case of an exception.
+		///
+		/// Throws a TimeoutException if the Condition is not signalled
+		/// within the given time interval.
+	{
+		if (!tryWait(mutex, milliseconds))
+			throw TimeoutException();
+	}
+	
+	template <class Mtx>
+	bool tryWait(Mtx& mutex, long milliseconds)
+		/// Unlocks the mutex (which must be locked upon calling
+		/// tryWait()) and waits for the given time until the Condition is signalled.
+		///
+		/// The given mutex will be locked again upon leaving the 
+		/// function, even in case of an exception.
+		///
+		/// Returns true if the Condition has been signalled
+		/// within the given time interval, otherwise false.
+	{
+		ScopedUnlock<Mtx> unlock(mutex, false);
+		Event event;
+		{
+			FastMutex::ScopedLock lock(_mutex);
+			mutex.unlock();
+			enqueue(event);
+		}
+		if (!event.tryWait(milliseconds))
+		{
+			FastMutex::ScopedLock lock(_mutex);
+			dequeue(event);
+			return false;
+		}
+		return true;
+	}
+	
+	void signal();
+		/// Signals the Condition and allows one waiting thread
+		/// to continue execution.
+
+	void broadcast();
+		/// Signals the Condition and allows all waiting
+		/// threads to continue their execution.
+
+protected:
+	void enqueue(Event& event);
+	void dequeue();
+	void dequeue(Event& event);
+	
+private:
+	Condition(const Condition&);
+	Condition& operator = (const Condition&);
+	
+	typedef std::deque<Event*> WaitQueue;
+	
+	FastMutex _mutex;
+	WaitQueue _waitQueue;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_Condition_INCLUDED
diff --git a/Foundation/include/Poco/DynamicAny.h b/Foundation/include/Poco/DynamicAny.h
index 1d576609a..e8fab2f34 100644
--- a/Foundation/include/Poco/DynamicAny.h
+++ b/Foundation/include/Poco/DynamicAny.h
@@ -1,1794 +1,1794 @@
-//
-// DynamicAny.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/DynamicAny.h#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  DynamicAny
-//
-// Definition of the DynamicAny class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_DynamicAny_INCLUDED
-#define Foundation_DynamicAny_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/DynamicAnyHolder.h"
-#include <typeinfo>
-
-
-namespace Poco {
-
-
-class Foundation_API DynamicAny
-	/// DynamicAny allows to store data of different types and to convert between these types transparently.
-	/// DynamicAny puts forth the best effort to provide intuitive and reasonable conversion semantics and prevent 
-	/// unexpected data loss, particularly when performing narrowing or signedness conversions of numeric data types.
-	///
-	/// Loss of signedness is not allowed for numeric values. This means that if an attempt is made to convert 
-	/// the internal value which is a negative signed integer to an unsigned integer type storage, a RangeException is thrown. 
-	/// Overflow is not allowed, so if the internal value is a larger number than the target numeric type size can accomodate, 
-	/// a RangeException is thrown.
-	///
-	/// Precision loss, such as in conversion from floating-point types to integers or from double to float on platforms
-	/// where they differ in size (provided internal actual value fits in float min/max range), is allowed.
-	/// 
-	/// String truncation is allowed -- it is possible to convert between string and character when string length is 
-	/// greater than 1. An empty string gets converted to the char '\0', a non-empty string is truncated to the first character. 
-	///
-	/// Boolean conversion is performed as follows:
-	///
-	/// A string value "false" (not case sensitive) or "0" can be converted to a boolean value false, any other string 
-	/// not being false by the above criteria evaluates to true (e.g: "hi" -> true).
-	/// Integer 0 values are false, everything else is true.
-	/// Floating point values equal to the minimal FP representation on a given platform are false, everything else is true.
-	///
-	/// Arithmetic operations with POD types as well as between DynamicAny's are supported, subject to following
-	/// limitations:
-	/// 
-	/// 	- for std::string and const char* values, only '+' and '+=' operations are supported
-	/// 
-	/// 	- for integral and floating point numeric values, following operations are supported:
-	/// 	  '+', '+=', '-', '-=', '*', '*=' , '/' and '/=' 
-	///
-	/// 	- for integral values, following operations are supported:
-	///		  prefix and postfix increment (++) and decement (--)
-	/// 
-	/// 	- for all other types, InvalidArgumentException is thrown upon attempt of an arithmetic operation
-	/// 
-	/// A DynamicAny can be created from and converted to a value of any type for which a specialization of 
-	/// DynamicAnyHolderImpl is available. For supported types, see DynamicAnyHolder documentation.
-{
-public:
-	DynamicAny();
-		/// Creates a DynamicAny holding an int with value 0.
-
-	template <typename T> 
-	DynamicAny(const T &val):
-		_pHolder(new DynamicAnyHolderImpl<T>(val))
-		/// Creates the DynamicAny from the given value.
-	{
-	}
-
-	DynamicAny(const char* pVal);
-		// Convenience constructor for const char* which gets mapped to a std::string internally, i.e. pVal is deep-copied.
-
-	DynamicAny(const DynamicAny& other);
-		/// Copy constructor.
-
-	~DynamicAny();
-		/// Destroys the DynamicAny.
-
-	void swap(DynamicAny& other);
-		/// Swaps the content of the this DynamicAny with the other DynamicAny.
-
-	template <typename T> 
-	void convert(T& val) const
-		/// Invoke this method to perform a safe conversion.
-		///
-		/// Example usage:
-		///     DynamicAny any("42");
-		///     int i;
-		///     any.convert(i);
-		///
-		/// Throws a RangeException if the value does not fit
-		/// into the result variable.
-		/// Throws a NotImplementedException if conversion is
-		/// not available for the given type.
-	{
-		_pHolder->convert(val);
-	}
-	
-	template <typename T> 
-	T convert() const
-		/// Invoke this method to perform a safe conversion.
-		///
-		/// Example usage:
-		///     DynamicAny any("42");
-		///     int i = any.convert<int>();
-		///
-		/// Throws a RangeException if the value does not fit
-		/// into the result variable.
-		/// Throws a NotImplementedException if conversion is
-		/// not available for the given type.
-	{
-		T result;
-		_pHolder->convert(result);
-		return result;
-	}
-	
-	template <typename T>
-	operator T () const
-		/// Safe conversion operator for implicit type
-		/// conversions.
-		///
-		/// Throws a RangeException if the value does not fit
-		/// into the result variable.
-		/// Throws a NotImplementedException if conversion is
-		/// not available for the given type.
-	{
-		T result;
-		_pHolder->convert(result);
-		return result;
-	}
-
-	template <typename T>
-	const T& extract() const
-		/// Returns a const reference to the actual value.
-		///
-		/// Must be instantiated with the exact type of
-		/// the stored value, otherwise a BadCastException
-		/// is thrown.
-	{
-		DynamicAnyHolderImpl<T>* pHolder = dynamic_cast<DynamicAnyHolderImpl<T>*>(_pHolder);
-		if (pHolder)
-			return pHolder->value();
-		else
-			throw BadCastException();
-	}
-
-	template <typename T> 
-	DynamicAny& operator = (const T& other)
-		/// Assignment operator for assigning POD to DynamicAny
-	{
-		DynamicAny tmp(other);
-		swap(tmp);
-		return *this;
-	}
-
-	DynamicAny& operator = (const DynamicAny& other);
-		/// Assignment operator specialization for DynamicAny
-
-	template <typename T> 
-	const DynamicAny operator + (const T& other) const
-		/// Addition operator for adding POD to DynamicAny
-	{
-		return convert<T>() + other;
-	}
-
-	const DynamicAny operator + (const DynamicAny& other) const;
-		/// Addition operator specialization for DynamicAny
-
-	const DynamicAny operator + (const char* other) const;
-		/// Addition operator specialization for adding const char* to DynamicAny
-
-	DynamicAny& operator ++ ();
-		/// Pre-increment operator
-
-	DynamicAny operator ++ (int);
-		/// Post-increment operator
-
-	DynamicAny& operator -- ();
-		/// Pre-decrement operator
-
-	DynamicAny operator -- (int);
-		/// Post-decrement operator
-
-	template <typename T> 
-	DynamicAny& operator += (const T& other)
-		/// Addition asignment operator for addition/assignment of POD to DynamicAny.
-	{
-		return *this = convert<T>() + other;
-	}
-
-	DynamicAny& operator += (const DynamicAny& other);
-		/// Addition asignment operator specialization for DynamicAny
-
-	DynamicAny& operator += (const char* other);
-		/// Addition asignment operator specialization for const char*
-
-	template <typename T> 
-	const DynamicAny operator - (const T& other) const
-		/// Subtraction operator for subtracting POD from DynamicAny
-	{
-		return convert<T>() - other;
-	}
-
-	const DynamicAny operator - (const DynamicAny& other) const;
-		/// Subtraction operator specialization for DynamicAny
-
-	template <typename T> 
-	DynamicAny& operator -= (const T& other)
-		/// Subtraction asignment operator
-	{
-		return *this = convert<T>() - other;
-	}
-
-	DynamicAny& operator -= (const DynamicAny& other);
-		/// Subtraction asignment operator specialization for DynamicAny
-
-	template <typename T> 
-	const DynamicAny operator * (const T& other) const
-		/// Multiplication operator for multiplying DynamicAny with POD
-	{
-		return convert<T>() * other;
-	}
-
-	const DynamicAny operator * (const DynamicAny& other) const;
-		/// Multiplication operator specialization for DynamicAny
-
-	template <typename T> 
-	DynamicAny& operator *= (const T& other)
-		/// Multiplication asignment operator
-	{
-		return *this = convert<T>() * other;
-	}
-
-	DynamicAny& operator *= (const DynamicAny& other);
-		/// Multiplication asignment operator specialization for DynamicAny
-
-	template <typename T> 
-	const DynamicAny operator / (const T& other) const
-		/// Division operator for dividing DynamicAny with POD
-	{
-		return convert<T>() / other;
-	}
-
-	const DynamicAny operator / (const DynamicAny& other) const;
-		/// Division operator specialization for DynamicAny
-
-	template <typename T> 
-	DynamicAny& operator /= (const T& other)
-		/// Division asignment operator
-	{
-		return *this = convert<T>() / other;
-	}
-
-	DynamicAny& operator /= (const DynamicAny& other);
-		/// Division asignment operator specialization for DynamicAny
-
-	template <typename T> 
-	bool operator == (const T& other) const
-		/// Equality operator
-	{
-		return convert<T>() == other;
-	}
-
-	bool operator == (const char* other) const;
-		/// Equality operator specialization for const char*
-
-	bool operator == (const DynamicAny& other) const;
-		/// Equality operator specialization for DynamicAny
-
-	template <typename T> 
-	bool operator != (const T& other) const
-		/// Inequality operator
-	{
-		return convert<T>() != other;
-	}
-
-	bool operator != (const DynamicAny& other) const;
-		/// Inequality operator  specialization for DynamicAny
-
-	bool operator != (const char* other) const;
-		/// Inequality operator  specialization for const char*
-
-	template <typename T> 
-	bool operator < (const T& other) const
-		/// Less than operator
-	{
-		return convert<T>() < other;
-	}
-
-	template <typename T> 
-	bool operator <= (const T& other) const
-		/// Less than or equal operator
-	{
-		return convert<T>() <= other;
-	}
-
-	template <typename T> 
-	bool operator > (const T& other) const
-		/// Greater than operator
-	{
-		return convert<T>() > other;
-	}
-
-	template <typename T> 
-	bool operator >= (const T& other) const
-		/// Greater than or equal operator
-	{
-		return convert<T>() >= other;
-	}
-
-	bool isArray() const;
-		/// Returns true if DynamicAny represents a vector
-
-	bool isStruct() const;
-		/// Returns true if DynamicAny represents a struct
-
-	template <typename T>
-	DynamicAny& operator [] (T n)
-		/// Index operator, only use on DynamicAnys where isArray
-		/// returns true! In all other cases a BadCastException is thrown!
-	{
-		DynamicAnyHolderImpl<std::vector<DynamicAny> >* pHolder =
-			dynamic_cast<DynamicAnyHolderImpl<std::vector<DynamicAny> > *>(_pHolder);
-		if (pHolder)
-			return pHolder->operator[](n);
-		else
-			throw BadCastException();
-	}
-
-	template <typename T>
-	const DynamicAny& operator [] (T n) const
-		/// const Index operator, only use on DynamicAnys where isArray
-		/// returns true! In all other cases a BadCastException is thrown!
-	{
-		const DynamicAnyHolderImpl<std::vector<DynamicAny> >* pHolder =
-			dynamic_cast<const DynamicAnyHolderImpl<std::vector<DynamicAny> > *>(_pHolder);
-		if (pHolder)
-			return pHolder->operator[](n);
-		else
-			throw BadCastException();
-	}
-
-	DynamicAny& operator [] (const std::string& name);
-		/// Index operator by name, only use on DynamicAnys where isStruct
-		/// returns true! In all other cases a BadCastException is thrown!
-
-	const DynamicAny& operator [] (const std::string& name) const;
-		/// Index operator by name, only use on DynamicAnys where isStruct
-		/// returns true! In all other cases a BadCastException is thrown!
-
-	DynamicAny& operator [] (const char* name);
-		/// Index operator by name, only use on DynamicAnys where isStruct
-		/// returns true! In all other cases a BadCastException is thrown!
-
-	const DynamicAny& operator [] (const char* name) const;
-		/// Index operator by name, only use on DynamicAnys where isStruct
-		/// returns true! In all other cases a BadCastException is thrown!
-
-	const std::type_info& type() const;
-		/// Returns the type information of the stored content.
-
-	bool isInteger() const;
-		/// Returns true if stored value is integer.
-
-	bool isSigned() const;
-		/// Returns true if stored value is signed.
-
-	bool isNumeric() const;
-		/// Returns true if stored value is numeric.
-		/// Returns false for numeric strings (e.g. "123" is string, not number)
-
-	bool isString() const;
-		/// Returns true if stored value is std::string.
-
-	static DynamicAny parse(const std::string& val);
-		/// Parses the string which must be in JSON format
-
-	static std::string toString(const DynamicAny& any);
-		/// Converts the DynamicAny to a string in JSON format. Note that toString will return
-		/// a different result than any.convert<std::string>()!
-	
-private:
-	static DynamicAny parse(const std::string& val, std::string::size_type& offset);
-		/// Parses the string which must be in JSON format
-
-	static DynamicAny parseObject(const std::string& val, std::string::size_type& pos);
-	static DynamicAny parseArray(const std::string& val, std::string::size_type& pos);
-	static std::string parseString(const std::string& val, std::string::size_type& pos);
-	static void skipWhiteSpace(const std::string& val, std::string::size_type& pos);
-
-	template <typename T>
-	T add(const DynamicAny& other) const
-	{
-		return convert<T>() + other.convert<T>();
-	}
-
-	template <typename T>
-	T subtract(const DynamicAny& other) const
-	{
-		return convert<T>() - other.convert<T>();
-	}
-	
-	template <typename T>
-	T multiply(const DynamicAny& other) const
-	{
-		return convert<T>() * other.convert<T>();
-	}
-
-	template <typename T>
-	T divide(const DynamicAny& other) const
-	{
-		return convert<T>() / other.convert<T>();
-	}
-
-	DynamicAnyHolder* _pHolder;
-};
-
-
-///
-/// inlines
-///
-
-
-///
-/// DynamicAny members
-///
-
-inline void DynamicAny::swap(DynamicAny& ptr)
-{
-	std::swap(_pHolder, ptr._pHolder);
-}
-
-
-inline const std::type_info& DynamicAny::type() const
-{
-	return _pHolder->type();
-}
-
-
-inline DynamicAny& DynamicAny::operator [] (const char* name)
-{
-	return operator [] (std::string(name));
-}
-
-
-inline const DynamicAny& DynamicAny::operator [] (const char* name) const
-{
-	return operator [] (std::string(name));
-}
-
-
-inline const DynamicAny DynamicAny::operator + (const char* other) const
-{
-	return convert<std::string>() + other;
-}
-
-
-inline DynamicAny& DynamicAny::operator += (const char*other)
-{
-	return *this = convert<std::string>() + other;
-}
-
-
-inline bool DynamicAny::operator == (const DynamicAny& other) const
-{
-	return convert<std::string>() == other.convert<std::string>();
-}
-
-
-inline bool DynamicAny::operator == (const char* other) const
-{
-	return convert<std::string>() == other;
-}
-
-
-inline bool DynamicAny::operator != (const DynamicAny& other) const
-{
-	return convert<std::string>() != other.convert<std::string>();
-}
-
-
-inline bool DynamicAny::operator != (const char* other) const
-{
-	return convert<std::string>() != other;
-}
-
-
-inline bool DynamicAny::isArray() const
-{
-	return _pHolder->isArray();
-}
-
-
-inline bool DynamicAny::isStruct() const
-{
-	return _pHolder->isStruct();
-}
-
-
-inline bool DynamicAny::isInteger() const
-{
-	return _pHolder->isInteger();
-}
-
-
-inline bool DynamicAny::isSigned() const
-{
-	return _pHolder->isSigned();
-}
-
-
-inline bool DynamicAny::isNumeric() const
-{
-	return _pHolder->isNumeric();
-}
-
-
-inline bool DynamicAny::isString() const
-{
-	return _pHolder->isString();
-}
-
-
-///
-/// DynamicAny non-member functions
-///
-
-inline const DynamicAny operator + (const char* other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to const char*
-{
-	std::string tmp = other;
-	return tmp + da.convert<std::string>();
-}
-
-
-inline const char operator + (const char& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to char
-{
-	return other + da.convert<char>();
-}
-
-
-inline const char operator - (const char& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from char
-{
-	return other - da.convert<char>();
-}
-
-
-inline const char operator * (const char& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with char
-{
-	return other * da.convert<char>();
-}
-
-
-inline const char operator / (const char& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with char
-{
-	return other / da.convert<char>();
-}
-
-
-inline char operator += (char& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to char
-{
-	return other += da.convert<char>();
-}
-
-
-inline char operator -= (char& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from char
-{
-	return other -= da.convert<char>();
-}
-
-
-inline char operator *= (char& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with char
-{
-	return other *= da.convert<char>();
-}
-
-
-inline char operator /= (char& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with char
-{
-	return other /= da.convert<char>();
-}
-
-
-inline const bool operator == (const char& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with char
-{
-	return other == da.convert<char>();
-}
-
-
-inline const bool operator != (const char& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with char
-{
-	return other != da.convert<char>();
-}
-
-
-inline const bool operator < (const char& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with char
-{
-	return other < da.convert<char>();
-}
-
-
-inline const bool operator <= (const char& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with char
-{
-	return other <= da.convert<char>();
-}
-
-
-inline const bool operator > (const char& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with char
-{
-	return other > da.convert<char>();
-}
-
-
-inline const bool operator >= (const char& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with char
-{
-	return other >= da.convert<char>();
-}
-
-
-inline const Poco::Int8 operator + (const Poco::Int8& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::Int8
-{
-	return other + da.convert<Poco::Int8>();
-}
-
-
-inline const Poco::Int8 operator - (const Poco::Int8& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::Int8
-{
-	return other - da.convert<Poco::Int8>();
-}
-
-
-inline const Poco::Int8 operator * (const Poco::Int8& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::Int8
-{
-	return other * da.convert<Poco::Int8>();
-}
-
-
-inline const Poco::Int8 operator / (const Poco::Int8& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::Int8
-{
-	return other / da.convert<Poco::Int8>();
-}
-
-
-inline Poco::Int8 operator += (Poco::Int8& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::Int8
-{
-	return other += da.convert<Poco::Int8>();
-}
-
-
-inline Poco::Int8 operator -= (Poco::Int8& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int8
-{
-	return other -= da.convert<Poco::Int8>();
-}
-
-
-inline Poco::Int8 operator *= (Poco::Int8& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int8
-{
-	return other *= da.convert<Poco::Int8>();
-}
-
-
-inline Poco::Int8 operator /= (Poco::Int8& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::Int8
-{
-	return other /= da.convert<Poco::Int8>();
-}
-
-
-inline const bool operator == (const Poco::Int8& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::Int8
-{
-	return other == da.convert<Poco::Int8>();
-}
-
-
-inline const bool operator != (const Poco::Int8& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::Int8
-{
-	return other != da.convert<Poco::Int8>();
-}
-
-
-inline const bool operator < (const Poco::Int8& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::Int8
-{
-	return other < da.convert<Poco::Int8>();
-}
-
-
-inline const bool operator <= (const Poco::Int8& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::Int8
-{
-	return other <= da.convert<Poco::Int8>();
-}
-
-
-inline const bool operator > (const Poco::Int8& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::Int8
-{
-	return other > da.convert<Poco::Int8>();
-}
-
-
-inline const bool operator >= (const Poco::Int8& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::Int8
-{
-	return other >= da.convert<Poco::Int8>();
-}
-
-
-inline const Poco::UInt8 operator + (const Poco::UInt8& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::UInt8
-{
-	return other + da.convert<Poco::UInt8>();
-}
-
-
-inline const Poco::UInt8 operator - (const Poco::UInt8& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::UInt8
-{
-	return other - da.convert<Poco::UInt8>();
-}
-
-
-inline const Poco::UInt8 operator * (const Poco::UInt8& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::UInt8
-{
-	return other * da.convert<Poco::UInt8>();
-}
-
-
-inline const Poco::UInt8 operator / (const Poco::UInt8& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::UInt8
-{
-	return other / da.convert<Poco::UInt8>();
-}
-
-
-inline Poco::UInt8 operator += (Poco::UInt8& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::UInt8
-{
-	return other += da.convert<Poco::UInt8>();
-}
-
-
-inline Poco::UInt8 operator -= (Poco::UInt8& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt8
-{
-	return other -= da.convert<Poco::UInt8>();
-}
-
-
-inline Poco::UInt8 operator *= (Poco::UInt8& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt8
-{
-	return other *= da.convert<Poco::UInt8>();
-}
-
-
-inline Poco::UInt8 operator /= (Poco::UInt8& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::UInt8
-{
-	return other /= da.convert<Poco::UInt8>();
-}
-
-
-inline const bool operator == (const Poco::UInt8& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::UInt8
-{
-	return other == da.convert<Poco::UInt8>();
-}
-
-
-inline const bool operator != (const Poco::UInt8& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::UInt8
-{
-	return other != da.convert<Poco::UInt8>();
-}
-
-
-inline const bool operator < (const Poco::UInt8& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::UInt8
-{
-	return other < da.convert<Poco::UInt8>();
-}
-
-
-inline const bool operator <= (const Poco::UInt8& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::UInt8
-{
-	return other <= da.convert<Poco::UInt8>();
-}
-
-
-inline const bool operator > (const Poco::UInt8& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::UInt8
-{
-	return other > da.convert<Poco::UInt8>();
-}
-
-
-inline const bool operator >= (const Poco::UInt8& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt8
-{
-	return other >= da.convert<Poco::UInt8>();
-}
-
-
-inline const Poco::Int16 operator + (const Poco::Int16& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::Int16
-{
-	return other + da.convert<Poco::Int16>();
-}
-
-
-inline const Poco::Int16 operator - (const Poco::Int16& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::Int16
-{
-	return other - da.convert<Poco::Int16>();
-}
-
-
-inline const Poco::Int16 operator * (const Poco::Int16& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::Int16
-{
-	return other * da.convert<Poco::Int16>();
-}
-
-
-inline const Poco::Int16 operator / (const Poco::Int16& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::Int16
-{
-	return other / da.convert<Poco::Int16>();
-}
-
-
-inline Poco::Int16 operator += (Poco::Int16& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::Int16
-{
-	return other += da.convert<Poco::Int16>();
-}
-
-
-inline Poco::Int16 operator -= (Poco::Int16& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int16
-{
-	return other -= da.convert<Poco::Int16>();
-}
-
-
-inline Poco::Int16 operator *= (Poco::Int16& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int16
-{
-	return other *= da.convert<Poco::Int16>();
-}
-
-
-inline Poco::Int16 operator /= (Poco::Int16& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::Int16
-{
-	return other /= da.convert<Poco::Int16>();
-}
-
-
-inline const bool operator == (const Poco::Int16& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::Int16
-{
-	return other == da.convert<Poco::Int16>();
-}
-
-
-inline const bool operator != (const Poco::Int16& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::Int16
-{
-	return other != da.convert<Poco::Int16>();
-}
-
-
-inline const bool operator < (const Poco::Int16& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::Int16
-{
-	return other < da.convert<Poco::Int16>();
-}
-
-
-inline const bool operator <= (const Poco::Int16& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::Int16
-{
-	return other <= da.convert<Poco::Int16>();
-}
-
-
-inline const bool operator > (const Poco::Int16& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::Int16
-{
-	return other > da.convert<Poco::Int16>();
-}
-
-
-inline const bool operator >= (const Poco::Int16& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::Int16
-{
-	return other >= da.convert<Poco::Int16>();
-}
-
-
-inline const Poco::UInt16 operator + (const Poco::UInt16& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::UInt16
-{
-	return other + da.convert<Poco::UInt16>();
-}
-
-
-inline const Poco::UInt16 operator - (const Poco::UInt16& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::UInt16
-{
-	return other - da.convert<Poco::UInt16>();
-}
-
-
-inline const Poco::UInt16 operator * (const Poco::UInt16& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::UInt16
-{
-	return other * da.convert<Poco::UInt16>();
-}
-
-
-inline const Poco::UInt16 operator / (const Poco::UInt16& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::UInt16
-{
-	return other / da.convert<Poco::UInt16>();
-}
-
-
-inline Poco::UInt16 operator += (Poco::UInt16& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::UInt16
-{
-	return other += da.convert<Poco::UInt16>();
-}
-
-
-inline Poco::UInt16 operator -= (Poco::UInt16& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt16
-{
-	return other -= da.convert<Poco::UInt16>();
-}
-
-
-inline Poco::UInt16 operator *= (Poco::UInt16& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt16
-{
-	return other *= da.convert<Poco::UInt16>();
-}
-
-
-inline Poco::UInt16 operator /= (Poco::UInt16& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::UInt16
-{
-	return other /= da.convert<Poco::UInt16>();
-}
-
-
-inline const bool operator == (const Poco::UInt16& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::UInt16
-{
-	return other == da.convert<Poco::UInt16>();
-}
-
-
-inline const bool operator != (const Poco::UInt16& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::UInt16
-{
-	return other != da.convert<Poco::UInt16>();
-}
-
-
-inline const bool operator < (const Poco::UInt16& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::UInt16
-{
-	return other < da.convert<Poco::UInt16>();
-}
-
-
-inline const bool operator <= (const Poco::UInt16& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::UInt16
-{
-	return other <= da.convert<Poco::UInt16>();
-}
-
-
-inline const bool operator > (const Poco::UInt16& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::UInt16
-{
-	return other > da.convert<Poco::UInt16>();
-}
-
-
-inline const bool operator >= (const Poco::UInt16& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt16
-{
-	return other >= da.convert<Poco::UInt16>();
-}
-
-
-inline const Poco::Int32 operator + (const Poco::Int32& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::Int32
-{
-	return other + da.convert<Poco::Int32>();
-}
-
-
-inline const Poco::Int32 operator - (const Poco::Int32& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::Int32
-{
-	return other - da.convert<Poco::Int32>();
-}
-
-
-inline const Poco::Int32 operator * (const Poco::Int32& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::Int32
-{
-	return other * da.convert<Poco::Int32>();
-}
-
-
-inline const Poco::Int32 operator / (const Poco::Int32& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::Int32
-{
-	return other / da.convert<Poco::Int32>();
-}
-
-
-inline Poco::Int32 operator += (Poco::Int32& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::Int32
-{
-	return other += da.convert<Poco::Int32>();
-}
-
-
-inline Poco::Int32 operator -= (Poco::Int32& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int32
-{
-	return other -= da.convert<Poco::Int32>();
-}
-
-
-inline Poco::Int32 operator *= (Poco::Int32& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int32
-{
-	return other *= da.convert<Poco::Int32>();
-}
-
-
-inline Poco::Int32 operator /= (Poco::Int32& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::Int32
-{
-	return other /= da.convert<Poco::Int32>();
-}
-
-
-inline const bool operator == (const Poco::Int32& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::Int32
-{
-	return other == da.convert<Poco::Int32>();
-}
-
-
-inline const bool operator != (const Poco::Int32& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::Int32
-{
-	return other != da.convert<Poco::Int32>();
-}
-
-
-inline const bool operator < (const Poco::Int32& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::Int32
-{
-	return other < da.convert<Poco::Int32>();
-}
-
-
-inline const bool operator <= (const Poco::Int32& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::Int32
-{
-	return other <= da.convert<Poco::Int32>();
-}
-
-
-inline const bool operator > (const Poco::Int32& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::Int32
-{
-	return other > da.convert<Poco::Int32>();
-}
-
-
-inline const bool operator >= (const Poco::Int32& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::Int32
-{
-	return other >= da.convert<Poco::Int32>();
-}
-
-
-inline const Poco::UInt32 operator + (const Poco::UInt32& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::UInt32
-{
-	return other + da.convert<Poco::UInt32>();
-}
-
-
-inline const Poco::UInt32 operator - (const Poco::UInt32& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::UInt32
-{
-	return other - da.convert<Poco::UInt32>();
-}
-
-
-inline const Poco::UInt32 operator * (const Poco::UInt32& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::UInt32
-{
-	return other * da.convert<Poco::UInt32>();
-}
-
-
-inline const Poco::UInt32 operator / (const Poco::UInt32& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::UInt32
-{
-	return other / da.convert<Poco::UInt32>();
-}
-
-
-inline Poco::UInt32 operator += (Poco::UInt32& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::UInt32
-{
-	return other += da.convert<Poco::UInt32>();
-}
-
-
-inline Poco::UInt32 operator -= (Poco::UInt32& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt32
-{
-	return other -= da.convert<Poco::UInt32>();
-}
-
-
-inline Poco::UInt32 operator *= (Poco::UInt32& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt32
-{
-	return other *= da.convert<Poco::UInt32>();
-}
-
-
-inline Poco::UInt32 operator /= (Poco::UInt32& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::UInt32
-{
-	return other /= da.convert<Poco::UInt32>();
-}
-
-
-inline const bool operator == (const Poco::UInt32& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::UInt32
-{
-	return other == da.convert<Poco::UInt32>();
-}
-
-
-inline const bool operator != (const Poco::UInt32& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::UInt32
-{
-	return other != da.convert<Poco::UInt32>();
-}
-
-
-inline const bool operator < (const Poco::UInt32& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::UInt32
-{
-	return other < da.convert<Poco::UInt32>();
-}
-
-
-inline const bool operator <= (const Poco::UInt32& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::UInt32
-{
-	return other <= da.convert<Poco::UInt32>();
-}
-
-
-inline const bool operator > (const Poco::UInt32& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::UInt32
-{
-	return other > da.convert<Poco::UInt32>();
-}
-
-
-inline const bool operator >= (const Poco::UInt32& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt32
-{
-	return other >= da.convert<Poco::UInt32>();
-}
-
-
-inline const Poco::Int64 operator + (const Poco::Int64& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::Int64
-{
-	return other + da.convert<Poco::Int64>();
-}
-
-
-inline const Poco::Int64 operator - (const Poco::Int64& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::Int64
-{
-	return other - da.convert<Poco::Int64>();
-}
-
-
-inline const Poco::Int64 operator * (const Poco::Int64& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::Int64
-{
-	return other * da.convert<Poco::Int64>();
-}
-
-
-inline const Poco::Int64 operator / (const Poco::Int64& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::Int64
-{
-	return other / da.convert<Poco::Int64>();
-}
-
-
-inline Poco::Int64 operator += (Poco::Int64& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::Int64
-{
-	return other += da.convert<Poco::Int64>();
-}
-
-
-inline Poco::Int64 operator -= (Poco::Int64& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int64
-{
-	return other -= da.convert<Poco::Int64>();
-}
-
-
-inline Poco::Int64 operator *= (Poco::Int64& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int64
-{
-	return other *= da.convert<Poco::Int64>();
-}
-
-
-inline Poco::Int64 operator /= (Poco::Int64& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::Int64
-{
-	return other /= da.convert<Poco::Int64>();
-}
-
-
-inline const bool operator == (const Poco::Int64& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::Int64
-{
-	return other == da.convert<Poco::Int64>();
-}
-
-
-inline const bool operator != (const Poco::Int64& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::Int64
-{
-	return other != da.convert<Poco::Int64>();
-}
-
-
-inline const bool operator < (const Poco::Int64& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::Int64
-{
-	return other < da.convert<Poco::Int64>();
-}
-
-
-inline const bool operator <= (const Poco::Int64& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::Int64
-{
-	return other <= da.convert<Poco::Int64>();
-}
-
-
-inline const bool operator > (const Poco::Int64& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::Int64
-{
-	return other > da.convert<Poco::Int64>();
-}
-
-
-inline const bool operator >= (const Poco::Int64& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::Int64
-{
-	return other >= da.convert<Poco::Int64>();
-}
-
-
-inline const Poco::UInt64 operator + (const Poco::UInt64& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to Poco::UInt64
-{
-	return other + da.convert<Poco::UInt64>();
-}
-
-
-inline const Poco::UInt64 operator - (const Poco::UInt64& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from Poco::UInt64
-{
-	return other - da.convert<Poco::UInt64>();
-}
-
-
-inline const Poco::UInt64 operator * (const Poco::UInt64& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with Poco::UInt64
-{
-	return other * da.convert<Poco::UInt64>();
-}
-
-
-inline const Poco::UInt64 operator / (const Poco::UInt64& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with Poco::UInt64
-{
-	return other / da.convert<Poco::UInt64>();
-}
-
-
-inline Poco::UInt64 operator += (Poco::UInt64& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to Poco::UInt64
-{
-	return other += da.convert<Poco::UInt64>();
-}
-
-
-inline Poco::UInt64 operator -= (Poco::UInt64& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt64
-{
-	return other -= da.convert<Poco::UInt64>();
-}
-
-
-inline Poco::UInt64 operator *= (Poco::UInt64& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt64
-{
-	return other *= da.convert<Poco::UInt64>();
-}
-
-
-inline Poco::UInt64 operator /= (Poco::UInt64& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with Poco::UInt64
-{
-	return other /= da.convert<Poco::UInt64>();
-}
-
-
-inline const bool operator == (const Poco::UInt64& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with Poco::UInt64
-{
-	return other == da.convert<Poco::UInt64>();
-}
-
-
-inline const bool operator != (const Poco::UInt64& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with Poco::UInt64
-{
-	return other != da.convert<Poco::UInt64>();
-}
-
-
-inline const bool operator < (const Poco::UInt64& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with Poco::UInt64
-{
-	return other < da.convert<Poco::UInt64>();
-}
-
-
-inline const bool operator <= (const Poco::UInt64& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with Poco::UInt64
-{
-	return other <= da.convert<Poco::UInt64>();
-}
-
-
-inline const bool operator > (const Poco::UInt64& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with Poco::UInt64
-{
-	return other > da.convert<Poco::UInt64>();
-}
-
-
-inline const bool operator >= (const Poco::UInt64& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt64
-{
-	return other >= da.convert<Poco::UInt64>();
-}
-
-
-inline const float operator + (const float& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to float
-{
-	return other + da.convert<float>();
-}
-
-
-inline const float operator - (const float& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from float
-{
-	return other - da.convert<float>();
-}
-
-
-inline const float operator * (const float& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with float
-{
-	return other * da.convert<float>();
-}
-
-
-inline const float operator / (const float& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with float
-{
-	return other / da.convert<float>();
-}
-
-
-inline float operator += (float& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to float
-{
-	return other += da.convert<float>();
-}
-
-
-inline float operator -= (float& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from float
-{
-	return other -= da.convert<float>();
-}
-
-
-inline float operator *= (float& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with float
-{
-	return other *= da.convert<float>();
-}
-
-
-inline float operator /= (float& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with float
-{
-	return other /= da.convert<float>();
-}
-
-
-inline const bool operator == (const float& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with float
-{
-	return other == da.convert<float>();
-}
-
-
-inline const bool operator != (const float& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with float
-{
-	return other != da.convert<float>();
-}
-
-
-inline const bool operator < (const float& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with float
-{
-	return other < da.convert<float>();
-}
-
-
-inline const bool operator <= (const float& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with float
-{
-	return other <= da.convert<float>();
-}
-
-
-inline const bool operator > (const float& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with float
-{
-	return other > da.convert<float>();
-}
-
-
-inline const bool operator >= (const float& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with float
-{
-	return other >= da.convert<float>();
-}
-
-
-inline const double operator + (const double& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to double
-{
-	return other + da.convert<double>();
-}
-
-
-inline const double operator - (const double& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from double
-{
-	return other - da.convert<double>();
-}
-
-
-inline const double operator * (const double& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with double
-{
-	return other * da.convert<double>();
-}
-
-
-inline const double operator / (const double& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with double
-{
-	return other / da.convert<double>();
-}
-
-
-inline double operator += (double& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to double
-{
-	return other += da.convert<double>();
-}
-
-
-inline double operator -= (double& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from double
-{
-	return other -= da.convert<double>();
-}
-
-
-inline double operator *= (double& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with double
-{
-	return other *= da.convert<double>();
-}
-
-
-inline double operator /= (double& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with double
-{
-	return other /= da.convert<double>();
-}
-
-
-inline const bool operator == (const double& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with double
-{
-	return other == da.convert<double>();
-}
-
-
-inline const bool operator != (const double& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with double
-{
-	return other != da.convert<double>();
-}
-
-
-inline const bool operator < (const double& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with double
-{
-	return other < da.convert<double>();
-}
-
-
-inline const bool operator <= (const double& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with double
-{
-	return other <= da.convert<double>();
-}
-
-
-inline const bool operator > (const double& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with double
-{
-	return other > da.convert<double>();
-}
-
-
-inline const bool operator >= (const double& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with double
-{
-	return other >= da.convert<double>();
-}
-
-
-inline const bool operator == (const bool& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with bool
-{
-	return other == da.convert<bool>();
-}
-
-
-inline const bool operator != (const bool& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with bool
-{
-	return other != da.convert<bool>();
-}
-
-
-inline const bool operator == (const std::string& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with std::string
-{
-	return other == da.convert<std::string>();
-}
-
-
-inline const bool operator != (const std::string& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with std::string
-{
-	return other != da.convert<std::string>();
-}
-
-
-inline const bool operator == (const char* other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with const char*
-{
-	return da.convert<std::string>() == other;
-}
-
-
-inline const bool operator != (const char* other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with const char*
-{
-	return da.convert<std::string>() != other;
-}
-
-
-#ifndef POCO_LONG_IS_64_BIT
-
-
-inline const long operator + (const long& other, const DynamicAny& da)
-	/// Addition operator for adding DynamicAny to long
-{
-	return other + da.convert<long>();
-}
-
-
-inline const long operator - (const long& other, const DynamicAny& da)
-	/// Subtraction operator for subtracting DynamicAny from long
-{
-	return other - da.convert<long>();
-}
-
-
-inline const long operator * (const long& other, const DynamicAny& da)
-	/// Multiplication operator for multiplying DynamicAny with long
-{
-	return other * da.convert<long>();
-}
-
-
-inline const long operator / (const long& other, const DynamicAny& da)
-	/// Division operator for dividing DynamicAny with long
-{
-	return other / da.convert<long>();
-}
-
-
-inline long operator += (long& other, const DynamicAny& da)
-	/// Addition asignment operator for adding DynamicAny to long
-{
-	return other += da.convert<long>();
-}
-
-
-inline long operator -= (long& other, const DynamicAny& da)
-	/// Subtraction asignment operator for subtracting DynamicAny from long
-{
-	return other -= da.convert<long>();
-}
-
-
-inline long operator *= (long& other, const DynamicAny& da)
-	/// Multiplication asignment operator for multiplying DynamicAny with long
-{
-	return other *= da.convert<long>();
-}
-
-
-inline long operator /= (long& other, const DynamicAny& da)
-	/// Division asignment operator for dividing DynamicAny with long
-{
-	return other /= da.convert<long>();
-}
-
-
-inline const bool operator == (const long& other, const DynamicAny& da)
-	/// Equality operator for comparing DynamicAny with long
-{
-	return other == da.convert<long>();
-}
-
-
-inline const bool operator != (const long& other, const DynamicAny& da)
-	/// Inequality operator for comparing DynamicAny with long
-{
-	return other != da.convert<long>();
-}
-
-
-inline const bool operator < (const long& other, const DynamicAny& da)
-	/// Less than operator for comparing DynamicAny with long
-{
-	return other < da.convert<long>();
-}
-
-
-inline const bool operator <= (const long& other, const DynamicAny& da)
-	/// Less than or equal operator for comparing DynamicAny with long
-{
-	return other <= da.convert<long>();
-}
-
-
-inline const bool operator > (const long& other, const DynamicAny& da)
-	/// Greater than operator for comparing DynamicAny with long
-{
-	return other > da.convert<long>();
-}
-
-
-inline const bool operator >= (const long& other, const DynamicAny& da)
-	/// Greater than or equal operator for comparing DynamicAny with long
-{
-	return other >= da.convert<long>();
-}
-
-
-#endif // POCO_LONG_IS_64_BIT
-
-
-} // namespace Poco
-
-
-#endif // Foundation_DynamicAny_INCLUDED
+//
+// DynamicAny.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/DynamicAny.h#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  DynamicAny
+//
+// Definition of the DynamicAny class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_DynamicAny_INCLUDED
+#define Foundation_DynamicAny_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/DynamicAnyHolder.h"
+#include <typeinfo>
+
+
+namespace Poco {
+
+
+class Foundation_API DynamicAny
+	/// DynamicAny allows to store data of different types and to convert between these types transparently.
+	/// DynamicAny puts forth the best effort to provide intuitive and reasonable conversion semantics and prevent 
+	/// unexpected data loss, particularly when performing narrowing or signedness conversions of numeric data types.
+	///
+	/// Loss of signedness is not allowed for numeric values. This means that if an attempt is made to convert 
+	/// the internal value which is a negative signed integer to an unsigned integer type storage, a RangeException is thrown. 
+	/// Overflow is not allowed, so if the internal value is a larger number than the target numeric type size can accomodate, 
+	/// a RangeException is thrown.
+	///
+	/// Precision loss, such as in conversion from floating-point types to integers or from double to float on platforms
+	/// where they differ in size (provided internal actual value fits in float min/max range), is allowed.
+	/// 
+	/// String truncation is allowed -- it is possible to convert between string and character when string length is 
+	/// greater than 1. An empty string gets converted to the char '\0', a non-empty string is truncated to the first character. 
+	///
+	/// Boolean conversion is performed as follows:
+	///
+	/// A string value "false" (not case sensitive) or "0" can be converted to a boolean value false, any other string 
+	/// not being false by the above criteria evaluates to true (e.g: "hi" -> true).
+	/// Integer 0 values are false, everything else is true.
+	/// Floating point values equal to the minimal FP representation on a given platform are false, everything else is true.
+	///
+	/// Arithmetic operations with POD types as well as between DynamicAny's are supported, subject to following
+	/// limitations:
+	/// 
+	/// 	- for std::string and const char* values, only '+' and '+=' operations are supported
+	/// 
+	/// 	- for integral and floating point numeric values, following operations are supported:
+	/// 	  '+', '+=', '-', '-=', '*', '*=' , '/' and '/=' 
+	///
+	/// 	- for integral values, following operations are supported:
+	///		  prefix and postfix increment (++) and decement (--)
+	/// 
+	/// 	- for all other types, InvalidArgumentException is thrown upon attempt of an arithmetic operation
+	/// 
+	/// A DynamicAny can be created from and converted to a value of any type for which a specialization of 
+	/// DynamicAnyHolderImpl is available. For supported types, see DynamicAnyHolder documentation.
+{
+public:
+	DynamicAny();
+		/// Creates a DynamicAny holding an int with value 0.
+
+	template <typename T> 
+	DynamicAny(const T &val):
+		_pHolder(new DynamicAnyHolderImpl<T>(val))
+		/// Creates the DynamicAny from the given value.
+	{
+	}
+
+	DynamicAny(const char* pVal);
+		// Convenience constructor for const char* which gets mapped to a std::string internally, i.e. pVal is deep-copied.
+
+	DynamicAny(const DynamicAny& other);
+		/// Copy constructor.
+
+	~DynamicAny();
+		/// Destroys the DynamicAny.
+
+	void swap(DynamicAny& other);
+		/// Swaps the content of the this DynamicAny with the other DynamicAny.
+
+	template <typename T> 
+	void convert(T& val) const
+		/// Invoke this method to perform a safe conversion.
+		///
+		/// Example usage:
+		///     DynamicAny any("42");
+		///     int i;
+		///     any.convert(i);
+		///
+		/// Throws a RangeException if the value does not fit
+		/// into the result variable.
+		/// Throws a NotImplementedException if conversion is
+		/// not available for the given type.
+	{
+		_pHolder->convert(val);
+	}
+	
+	template <typename T> 
+	T convert() const
+		/// Invoke this method to perform a safe conversion.
+		///
+		/// Example usage:
+		///     DynamicAny any("42");
+		///     int i = any.convert<int>();
+		///
+		/// Throws a RangeException if the value does not fit
+		/// into the result variable.
+		/// Throws a NotImplementedException if conversion is
+		/// not available for the given type.
+	{
+		T result;
+		_pHolder->convert(result);
+		return result;
+	}
+	
+	template <typename T>
+	operator T () const
+		/// Safe conversion operator for implicit type
+		/// conversions.
+		///
+		/// Throws a RangeException if the value does not fit
+		/// into the result variable.
+		/// Throws a NotImplementedException if conversion is
+		/// not available for the given type.
+	{
+		T result;
+		_pHolder->convert(result);
+		return result;
+	}
+
+	template <typename T>
+	const T& extract() const
+		/// Returns a const reference to the actual value.
+		///
+		/// Must be instantiated with the exact type of
+		/// the stored value, otherwise a BadCastException
+		/// is thrown.
+	{
+		DynamicAnyHolderImpl<T>* pHolder = dynamic_cast<DynamicAnyHolderImpl<T>*>(_pHolder);
+		if (pHolder)
+			return pHolder->value();
+		else
+			throw BadCastException();
+	}
+
+	template <typename T> 
+	DynamicAny& operator = (const T& other)
+		/// Assignment operator for assigning POD to DynamicAny
+	{
+		DynamicAny tmp(other);
+		swap(tmp);
+		return *this;
+	}
+
+	DynamicAny& operator = (const DynamicAny& other);
+		/// Assignment operator specialization for DynamicAny
+
+	template <typename T> 
+	const DynamicAny operator + (const T& other) const
+		/// Addition operator for adding POD to DynamicAny
+	{
+		return convert<T>() + other;
+	}
+
+	const DynamicAny operator + (const DynamicAny& other) const;
+		/// Addition operator specialization for DynamicAny
+
+	const DynamicAny operator + (const char* other) const;
+		/// Addition operator specialization for adding const char* to DynamicAny
+
+	DynamicAny& operator ++ ();
+		/// Pre-increment operator
+
+	DynamicAny operator ++ (int);
+		/// Post-increment operator
+
+	DynamicAny& operator -- ();
+		/// Pre-decrement operator
+
+	DynamicAny operator -- (int);
+		/// Post-decrement operator
+
+	template <typename T> 
+	DynamicAny& operator += (const T& other)
+		/// Addition asignment operator for addition/assignment of POD to DynamicAny.
+	{
+		return *this = convert<T>() + other;
+	}
+
+	DynamicAny& operator += (const DynamicAny& other);
+		/// Addition asignment operator specialization for DynamicAny
+
+	DynamicAny& operator += (const char* other);
+		/// Addition asignment operator specialization for const char*
+
+	template <typename T> 
+	const DynamicAny operator - (const T& other) const
+		/// Subtraction operator for subtracting POD from DynamicAny
+	{
+		return convert<T>() - other;
+	}
+
+	const DynamicAny operator - (const DynamicAny& other) const;
+		/// Subtraction operator specialization for DynamicAny
+
+	template <typename T> 
+	DynamicAny& operator -= (const T& other)
+		/// Subtraction asignment operator
+	{
+		return *this = convert<T>() - other;
+	}
+
+	DynamicAny& operator -= (const DynamicAny& other);
+		/// Subtraction asignment operator specialization for DynamicAny
+
+	template <typename T> 
+	const DynamicAny operator * (const T& other) const
+		/// Multiplication operator for multiplying DynamicAny with POD
+	{
+		return convert<T>() * other;
+	}
+
+	const DynamicAny operator * (const DynamicAny& other) const;
+		/// Multiplication operator specialization for DynamicAny
+
+	template <typename T> 
+	DynamicAny& operator *= (const T& other)
+		/// Multiplication asignment operator
+	{
+		return *this = convert<T>() * other;
+	}
+
+	DynamicAny& operator *= (const DynamicAny& other);
+		/// Multiplication asignment operator specialization for DynamicAny
+
+	template <typename T> 
+	const DynamicAny operator / (const T& other) const
+		/// Division operator for dividing DynamicAny with POD
+	{
+		return convert<T>() / other;
+	}
+
+	const DynamicAny operator / (const DynamicAny& other) const;
+		/// Division operator specialization for DynamicAny
+
+	template <typename T> 
+	DynamicAny& operator /= (const T& other)
+		/// Division asignment operator
+	{
+		return *this = convert<T>() / other;
+	}
+
+	DynamicAny& operator /= (const DynamicAny& other);
+		/// Division asignment operator specialization for DynamicAny
+
+	template <typename T> 
+	bool operator == (const T& other) const
+		/// Equality operator
+	{
+		return convert<T>() == other;
+	}
+
+	bool operator == (const char* other) const;
+		/// Equality operator specialization for const char*
+
+	bool operator == (const DynamicAny& other) const;
+		/// Equality operator specialization for DynamicAny
+
+	template <typename T> 
+	bool operator != (const T& other) const
+		/// Inequality operator
+	{
+		return convert<T>() != other;
+	}
+
+	bool operator != (const DynamicAny& other) const;
+		/// Inequality operator  specialization for DynamicAny
+
+	bool operator != (const char* other) const;
+		/// Inequality operator  specialization for const char*
+
+	template <typename T> 
+	bool operator < (const T& other) const
+		/// Less than operator
+	{
+		return convert<T>() < other;
+	}
+
+	template <typename T> 
+	bool operator <= (const T& other) const
+		/// Less than or equal operator
+	{
+		return convert<T>() <= other;
+	}
+
+	template <typename T> 
+	bool operator > (const T& other) const
+		/// Greater than operator
+	{
+		return convert<T>() > other;
+	}
+
+	template <typename T> 
+	bool operator >= (const T& other) const
+		/// Greater than or equal operator
+	{
+		return convert<T>() >= other;
+	}
+
+	bool isArray() const;
+		/// Returns true if DynamicAny represents a vector
+
+	bool isStruct() const;
+		/// Returns true if DynamicAny represents a struct
+
+	template <typename T>
+	DynamicAny& operator [] (T n)
+		/// Index operator, only use on DynamicAnys where isArray
+		/// returns true! In all other cases a BadCastException is thrown!
+	{
+		DynamicAnyHolderImpl<std::vector<DynamicAny> >* pHolder =
+			dynamic_cast<DynamicAnyHolderImpl<std::vector<DynamicAny> > *>(_pHolder);
+		if (pHolder)
+			return pHolder->operator[](n);
+		else
+			throw BadCastException();
+	}
+
+	template <typename T>
+	const DynamicAny& operator [] (T n) const
+		/// const Index operator, only use on DynamicAnys where isArray
+		/// returns true! In all other cases a BadCastException is thrown!
+	{
+		const DynamicAnyHolderImpl<std::vector<DynamicAny> >* pHolder =
+			dynamic_cast<const DynamicAnyHolderImpl<std::vector<DynamicAny> > *>(_pHolder);
+		if (pHolder)
+			return pHolder->operator[](n);
+		else
+			throw BadCastException();
+	}
+
+	DynamicAny& operator [] (const std::string& name);
+		/// Index operator by name, only use on DynamicAnys where isStruct
+		/// returns true! In all other cases a BadCastException is thrown!
+
+	const DynamicAny& operator [] (const std::string& name) const;
+		/// Index operator by name, only use on DynamicAnys where isStruct
+		/// returns true! In all other cases a BadCastException is thrown!
+
+	DynamicAny& operator [] (const char* name);
+		/// Index operator by name, only use on DynamicAnys where isStruct
+		/// returns true! In all other cases a BadCastException is thrown!
+
+	const DynamicAny& operator [] (const char* name) const;
+		/// Index operator by name, only use on DynamicAnys where isStruct
+		/// returns true! In all other cases a BadCastException is thrown!
+
+	const std::type_info& type() const;
+		/// Returns the type information of the stored content.
+
+	bool isInteger() const;
+		/// Returns true if stored value is integer.
+
+	bool isSigned() const;
+		/// Returns true if stored value is signed.
+
+	bool isNumeric() const;
+		/// Returns true if stored value is numeric.
+		/// Returns false for numeric strings (e.g. "123" is string, not number)
+
+	bool isString() const;
+		/// Returns true if stored value is std::string.
+
+	static DynamicAny parse(const std::string& val);
+		/// Parses the string which must be in JSON format
+
+	static std::string toString(const DynamicAny& any);
+		/// Converts the DynamicAny to a string in JSON format. Note that toString will return
+		/// a different result than any.convert<std::string>()!
+	
+private:
+	static DynamicAny parse(const std::string& val, std::string::size_type& offset);
+		/// Parses the string which must be in JSON format
+
+	static DynamicAny parseObject(const std::string& val, std::string::size_type& pos);
+	static DynamicAny parseArray(const std::string& val, std::string::size_type& pos);
+	static std::string parseString(const std::string& val, std::string::size_type& pos);
+	static void skipWhiteSpace(const std::string& val, std::string::size_type& pos);
+
+	template <typename T>
+	T add(const DynamicAny& other) const
+	{
+		return convert<T>() + other.convert<T>();
+	}
+
+	template <typename T>
+	T subtract(const DynamicAny& other) const
+	{
+		return convert<T>() - other.convert<T>();
+	}
+	
+	template <typename T>
+	T multiply(const DynamicAny& other) const
+	{
+		return convert<T>() * other.convert<T>();
+	}
+
+	template <typename T>
+	T divide(const DynamicAny& other) const
+	{
+		return convert<T>() / other.convert<T>();
+	}
+
+	DynamicAnyHolder* _pHolder;
+};
+
+
+///
+/// inlines
+///
+
+
+///
+/// DynamicAny members
+///
+
+inline void DynamicAny::swap(DynamicAny& ptr)
+{
+	std::swap(_pHolder, ptr._pHolder);
+}
+
+
+inline const std::type_info& DynamicAny::type() const
+{
+	return _pHolder->type();
+}
+
+
+inline DynamicAny& DynamicAny::operator [] (const char* name)
+{
+	return operator [] (std::string(name));
+}
+
+
+inline const DynamicAny& DynamicAny::operator [] (const char* name) const
+{
+	return operator [] (std::string(name));
+}
+
+
+inline const DynamicAny DynamicAny::operator + (const char* other) const
+{
+	return convert<std::string>() + other;
+}
+
+
+inline DynamicAny& DynamicAny::operator += (const char*other)
+{
+	return *this = convert<std::string>() + other;
+}
+
+
+inline bool DynamicAny::operator == (const DynamicAny& other) const
+{
+	return convert<std::string>() == other.convert<std::string>();
+}
+
+
+inline bool DynamicAny::operator == (const char* other) const
+{
+	return convert<std::string>() == other;
+}
+
+
+inline bool DynamicAny::operator != (const DynamicAny& other) const
+{
+	return convert<std::string>() != other.convert<std::string>();
+}
+
+
+inline bool DynamicAny::operator != (const char* other) const
+{
+	return convert<std::string>() != other;
+}
+
+
+inline bool DynamicAny::isArray() const
+{
+	return _pHolder->isArray();
+}
+
+
+inline bool DynamicAny::isStruct() const
+{
+	return _pHolder->isStruct();
+}
+
+
+inline bool DynamicAny::isInteger() const
+{
+	return _pHolder->isInteger();
+}
+
+
+inline bool DynamicAny::isSigned() const
+{
+	return _pHolder->isSigned();
+}
+
+
+inline bool DynamicAny::isNumeric() const
+{
+	return _pHolder->isNumeric();
+}
+
+
+inline bool DynamicAny::isString() const
+{
+	return _pHolder->isString();
+}
+
+
+///
+/// DynamicAny non-member functions
+///
+
+inline const DynamicAny operator + (const char* other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to const char*
+{
+	std::string tmp = other;
+	return tmp + da.convert<std::string>();
+}
+
+
+inline const char operator + (const char& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to char
+{
+	return other + da.convert<char>();
+}
+
+
+inline const char operator - (const char& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from char
+{
+	return other - da.convert<char>();
+}
+
+
+inline const char operator * (const char& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with char
+{
+	return other * da.convert<char>();
+}
+
+
+inline const char operator / (const char& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with char
+{
+	return other / da.convert<char>();
+}
+
+
+inline char operator += (char& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to char
+{
+	return other += da.convert<char>();
+}
+
+
+inline char operator -= (char& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from char
+{
+	return other -= da.convert<char>();
+}
+
+
+inline char operator *= (char& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with char
+{
+	return other *= da.convert<char>();
+}
+
+
+inline char operator /= (char& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with char
+{
+	return other /= da.convert<char>();
+}
+
+
+inline const bool operator == (const char& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with char
+{
+	return other == da.convert<char>();
+}
+
+
+inline const bool operator != (const char& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with char
+{
+	return other != da.convert<char>();
+}
+
+
+inline const bool operator < (const char& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with char
+{
+	return other < da.convert<char>();
+}
+
+
+inline const bool operator <= (const char& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with char
+{
+	return other <= da.convert<char>();
+}
+
+
+inline const bool operator > (const char& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with char
+{
+	return other > da.convert<char>();
+}
+
+
+inline const bool operator >= (const char& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with char
+{
+	return other >= da.convert<char>();
+}
+
+
+inline const Poco::Int8 operator + (const Poco::Int8& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::Int8
+{
+	return other + da.convert<Poco::Int8>();
+}
+
+
+inline const Poco::Int8 operator - (const Poco::Int8& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::Int8
+{
+	return other - da.convert<Poco::Int8>();
+}
+
+
+inline const Poco::Int8 operator * (const Poco::Int8& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::Int8
+{
+	return other * da.convert<Poco::Int8>();
+}
+
+
+inline const Poco::Int8 operator / (const Poco::Int8& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::Int8
+{
+	return other / da.convert<Poco::Int8>();
+}
+
+
+inline Poco::Int8 operator += (Poco::Int8& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::Int8
+{
+	return other += da.convert<Poco::Int8>();
+}
+
+
+inline Poco::Int8 operator -= (Poco::Int8& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int8
+{
+	return other -= da.convert<Poco::Int8>();
+}
+
+
+inline Poco::Int8 operator *= (Poco::Int8& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int8
+{
+	return other *= da.convert<Poco::Int8>();
+}
+
+
+inline Poco::Int8 operator /= (Poco::Int8& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::Int8
+{
+	return other /= da.convert<Poco::Int8>();
+}
+
+
+inline const bool operator == (const Poco::Int8& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::Int8
+{
+	return other == da.convert<Poco::Int8>();
+}
+
+
+inline const bool operator != (const Poco::Int8& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::Int8
+{
+	return other != da.convert<Poco::Int8>();
+}
+
+
+inline const bool operator < (const Poco::Int8& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::Int8
+{
+	return other < da.convert<Poco::Int8>();
+}
+
+
+inline const bool operator <= (const Poco::Int8& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::Int8
+{
+	return other <= da.convert<Poco::Int8>();
+}
+
+
+inline const bool operator > (const Poco::Int8& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::Int8
+{
+	return other > da.convert<Poco::Int8>();
+}
+
+
+inline const bool operator >= (const Poco::Int8& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::Int8
+{
+	return other >= da.convert<Poco::Int8>();
+}
+
+
+inline const Poco::UInt8 operator + (const Poco::UInt8& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::UInt8
+{
+	return other + da.convert<Poco::UInt8>();
+}
+
+
+inline const Poco::UInt8 operator - (const Poco::UInt8& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::UInt8
+{
+	return other - da.convert<Poco::UInt8>();
+}
+
+
+inline const Poco::UInt8 operator * (const Poco::UInt8& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::UInt8
+{
+	return other * da.convert<Poco::UInt8>();
+}
+
+
+inline const Poco::UInt8 operator / (const Poco::UInt8& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::UInt8
+{
+	return other / da.convert<Poco::UInt8>();
+}
+
+
+inline Poco::UInt8 operator += (Poco::UInt8& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::UInt8
+{
+	return other += da.convert<Poco::UInt8>();
+}
+
+
+inline Poco::UInt8 operator -= (Poco::UInt8& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt8
+{
+	return other -= da.convert<Poco::UInt8>();
+}
+
+
+inline Poco::UInt8 operator *= (Poco::UInt8& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt8
+{
+	return other *= da.convert<Poco::UInt8>();
+}
+
+
+inline Poco::UInt8 operator /= (Poco::UInt8& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::UInt8
+{
+	return other /= da.convert<Poco::UInt8>();
+}
+
+
+inline const bool operator == (const Poco::UInt8& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::UInt8
+{
+	return other == da.convert<Poco::UInt8>();
+}
+
+
+inline const bool operator != (const Poco::UInt8& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::UInt8
+{
+	return other != da.convert<Poco::UInt8>();
+}
+
+
+inline const bool operator < (const Poco::UInt8& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::UInt8
+{
+	return other < da.convert<Poco::UInt8>();
+}
+
+
+inline const bool operator <= (const Poco::UInt8& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::UInt8
+{
+	return other <= da.convert<Poco::UInt8>();
+}
+
+
+inline const bool operator > (const Poco::UInt8& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::UInt8
+{
+	return other > da.convert<Poco::UInt8>();
+}
+
+
+inline const bool operator >= (const Poco::UInt8& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt8
+{
+	return other >= da.convert<Poco::UInt8>();
+}
+
+
+inline const Poco::Int16 operator + (const Poco::Int16& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::Int16
+{
+	return other + da.convert<Poco::Int16>();
+}
+
+
+inline const Poco::Int16 operator - (const Poco::Int16& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::Int16
+{
+	return other - da.convert<Poco::Int16>();
+}
+
+
+inline const Poco::Int16 operator * (const Poco::Int16& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::Int16
+{
+	return other * da.convert<Poco::Int16>();
+}
+
+
+inline const Poco::Int16 operator / (const Poco::Int16& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::Int16
+{
+	return other / da.convert<Poco::Int16>();
+}
+
+
+inline Poco::Int16 operator += (Poco::Int16& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::Int16
+{
+	return other += da.convert<Poco::Int16>();
+}
+
+
+inline Poco::Int16 operator -= (Poco::Int16& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int16
+{
+	return other -= da.convert<Poco::Int16>();
+}
+
+
+inline Poco::Int16 operator *= (Poco::Int16& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int16
+{
+	return other *= da.convert<Poco::Int16>();
+}
+
+
+inline Poco::Int16 operator /= (Poco::Int16& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::Int16
+{
+	return other /= da.convert<Poco::Int16>();
+}
+
+
+inline const bool operator == (const Poco::Int16& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::Int16
+{
+	return other == da.convert<Poco::Int16>();
+}
+
+
+inline const bool operator != (const Poco::Int16& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::Int16
+{
+	return other != da.convert<Poco::Int16>();
+}
+
+
+inline const bool operator < (const Poco::Int16& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::Int16
+{
+	return other < da.convert<Poco::Int16>();
+}
+
+
+inline const bool operator <= (const Poco::Int16& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::Int16
+{
+	return other <= da.convert<Poco::Int16>();
+}
+
+
+inline const bool operator > (const Poco::Int16& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::Int16
+{
+	return other > da.convert<Poco::Int16>();
+}
+
+
+inline const bool operator >= (const Poco::Int16& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::Int16
+{
+	return other >= da.convert<Poco::Int16>();
+}
+
+
+inline const Poco::UInt16 operator + (const Poco::UInt16& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::UInt16
+{
+	return other + da.convert<Poco::UInt16>();
+}
+
+
+inline const Poco::UInt16 operator - (const Poco::UInt16& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::UInt16
+{
+	return other - da.convert<Poco::UInt16>();
+}
+
+
+inline const Poco::UInt16 operator * (const Poco::UInt16& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::UInt16
+{
+	return other * da.convert<Poco::UInt16>();
+}
+
+
+inline const Poco::UInt16 operator / (const Poco::UInt16& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::UInt16
+{
+	return other / da.convert<Poco::UInt16>();
+}
+
+
+inline Poco::UInt16 operator += (Poco::UInt16& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::UInt16
+{
+	return other += da.convert<Poco::UInt16>();
+}
+
+
+inline Poco::UInt16 operator -= (Poco::UInt16& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt16
+{
+	return other -= da.convert<Poco::UInt16>();
+}
+
+
+inline Poco::UInt16 operator *= (Poco::UInt16& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt16
+{
+	return other *= da.convert<Poco::UInt16>();
+}
+
+
+inline Poco::UInt16 operator /= (Poco::UInt16& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::UInt16
+{
+	return other /= da.convert<Poco::UInt16>();
+}
+
+
+inline const bool operator == (const Poco::UInt16& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::UInt16
+{
+	return other == da.convert<Poco::UInt16>();
+}
+
+
+inline const bool operator != (const Poco::UInt16& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::UInt16
+{
+	return other != da.convert<Poco::UInt16>();
+}
+
+
+inline const bool operator < (const Poco::UInt16& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::UInt16
+{
+	return other < da.convert<Poco::UInt16>();
+}
+
+
+inline const bool operator <= (const Poco::UInt16& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::UInt16
+{
+	return other <= da.convert<Poco::UInt16>();
+}
+
+
+inline const bool operator > (const Poco::UInt16& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::UInt16
+{
+	return other > da.convert<Poco::UInt16>();
+}
+
+
+inline const bool operator >= (const Poco::UInt16& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt16
+{
+	return other >= da.convert<Poco::UInt16>();
+}
+
+
+inline const Poco::Int32 operator + (const Poco::Int32& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::Int32
+{
+	return other + da.convert<Poco::Int32>();
+}
+
+
+inline const Poco::Int32 operator - (const Poco::Int32& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::Int32
+{
+	return other - da.convert<Poco::Int32>();
+}
+
+
+inline const Poco::Int32 operator * (const Poco::Int32& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::Int32
+{
+	return other * da.convert<Poco::Int32>();
+}
+
+
+inline const Poco::Int32 operator / (const Poco::Int32& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::Int32
+{
+	return other / da.convert<Poco::Int32>();
+}
+
+
+inline Poco::Int32 operator += (Poco::Int32& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::Int32
+{
+	return other += da.convert<Poco::Int32>();
+}
+
+
+inline Poco::Int32 operator -= (Poco::Int32& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int32
+{
+	return other -= da.convert<Poco::Int32>();
+}
+
+
+inline Poco::Int32 operator *= (Poco::Int32& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int32
+{
+	return other *= da.convert<Poco::Int32>();
+}
+
+
+inline Poco::Int32 operator /= (Poco::Int32& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::Int32
+{
+	return other /= da.convert<Poco::Int32>();
+}
+
+
+inline const bool operator == (const Poco::Int32& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::Int32
+{
+	return other == da.convert<Poco::Int32>();
+}
+
+
+inline const bool operator != (const Poco::Int32& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::Int32
+{
+	return other != da.convert<Poco::Int32>();
+}
+
+
+inline const bool operator < (const Poco::Int32& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::Int32
+{
+	return other < da.convert<Poco::Int32>();
+}
+
+
+inline const bool operator <= (const Poco::Int32& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::Int32
+{
+	return other <= da.convert<Poco::Int32>();
+}
+
+
+inline const bool operator > (const Poco::Int32& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::Int32
+{
+	return other > da.convert<Poco::Int32>();
+}
+
+
+inline const bool operator >= (const Poco::Int32& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::Int32
+{
+	return other >= da.convert<Poco::Int32>();
+}
+
+
+inline const Poco::UInt32 operator + (const Poco::UInt32& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::UInt32
+{
+	return other + da.convert<Poco::UInt32>();
+}
+
+
+inline const Poco::UInt32 operator - (const Poco::UInt32& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::UInt32
+{
+	return other - da.convert<Poco::UInt32>();
+}
+
+
+inline const Poco::UInt32 operator * (const Poco::UInt32& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::UInt32
+{
+	return other * da.convert<Poco::UInt32>();
+}
+
+
+inline const Poco::UInt32 operator / (const Poco::UInt32& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::UInt32
+{
+	return other / da.convert<Poco::UInt32>();
+}
+
+
+inline Poco::UInt32 operator += (Poco::UInt32& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::UInt32
+{
+	return other += da.convert<Poco::UInt32>();
+}
+
+
+inline Poco::UInt32 operator -= (Poco::UInt32& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt32
+{
+	return other -= da.convert<Poco::UInt32>();
+}
+
+
+inline Poco::UInt32 operator *= (Poco::UInt32& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt32
+{
+	return other *= da.convert<Poco::UInt32>();
+}
+
+
+inline Poco::UInt32 operator /= (Poco::UInt32& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::UInt32
+{
+	return other /= da.convert<Poco::UInt32>();
+}
+
+
+inline const bool operator == (const Poco::UInt32& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::UInt32
+{
+	return other == da.convert<Poco::UInt32>();
+}
+
+
+inline const bool operator != (const Poco::UInt32& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::UInt32
+{
+	return other != da.convert<Poco::UInt32>();
+}
+
+
+inline const bool operator < (const Poco::UInt32& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::UInt32
+{
+	return other < da.convert<Poco::UInt32>();
+}
+
+
+inline const bool operator <= (const Poco::UInt32& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::UInt32
+{
+	return other <= da.convert<Poco::UInt32>();
+}
+
+
+inline const bool operator > (const Poco::UInt32& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::UInt32
+{
+	return other > da.convert<Poco::UInt32>();
+}
+
+
+inline const bool operator >= (const Poco::UInt32& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt32
+{
+	return other >= da.convert<Poco::UInt32>();
+}
+
+
+inline const Poco::Int64 operator + (const Poco::Int64& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::Int64
+{
+	return other + da.convert<Poco::Int64>();
+}
+
+
+inline const Poco::Int64 operator - (const Poco::Int64& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::Int64
+{
+	return other - da.convert<Poco::Int64>();
+}
+
+
+inline const Poco::Int64 operator * (const Poco::Int64& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::Int64
+{
+	return other * da.convert<Poco::Int64>();
+}
+
+
+inline const Poco::Int64 operator / (const Poco::Int64& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::Int64
+{
+	return other / da.convert<Poco::Int64>();
+}
+
+
+inline Poco::Int64 operator += (Poco::Int64& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::Int64
+{
+	return other += da.convert<Poco::Int64>();
+}
+
+
+inline Poco::Int64 operator -= (Poco::Int64& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::Int64
+{
+	return other -= da.convert<Poco::Int64>();
+}
+
+
+inline Poco::Int64 operator *= (Poco::Int64& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::Int64
+{
+	return other *= da.convert<Poco::Int64>();
+}
+
+
+inline Poco::Int64 operator /= (Poco::Int64& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::Int64
+{
+	return other /= da.convert<Poco::Int64>();
+}
+
+
+inline const bool operator == (const Poco::Int64& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::Int64
+{
+	return other == da.convert<Poco::Int64>();
+}
+
+
+inline const bool operator != (const Poco::Int64& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::Int64
+{
+	return other != da.convert<Poco::Int64>();
+}
+
+
+inline const bool operator < (const Poco::Int64& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::Int64
+{
+	return other < da.convert<Poco::Int64>();
+}
+
+
+inline const bool operator <= (const Poco::Int64& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::Int64
+{
+	return other <= da.convert<Poco::Int64>();
+}
+
+
+inline const bool operator > (const Poco::Int64& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::Int64
+{
+	return other > da.convert<Poco::Int64>();
+}
+
+
+inline const bool operator >= (const Poco::Int64& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::Int64
+{
+	return other >= da.convert<Poco::Int64>();
+}
+
+
+inline const Poco::UInt64 operator + (const Poco::UInt64& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to Poco::UInt64
+{
+	return other + da.convert<Poco::UInt64>();
+}
+
+
+inline const Poco::UInt64 operator - (const Poco::UInt64& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from Poco::UInt64
+{
+	return other - da.convert<Poco::UInt64>();
+}
+
+
+inline const Poco::UInt64 operator * (const Poco::UInt64& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with Poco::UInt64
+{
+	return other * da.convert<Poco::UInt64>();
+}
+
+
+inline const Poco::UInt64 operator / (const Poco::UInt64& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with Poco::UInt64
+{
+	return other / da.convert<Poco::UInt64>();
+}
+
+
+inline Poco::UInt64 operator += (Poco::UInt64& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to Poco::UInt64
+{
+	return other += da.convert<Poco::UInt64>();
+}
+
+
+inline Poco::UInt64 operator -= (Poco::UInt64& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from Poco::UInt64
+{
+	return other -= da.convert<Poco::UInt64>();
+}
+
+
+inline Poco::UInt64 operator *= (Poco::UInt64& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with Poco::UInt64
+{
+	return other *= da.convert<Poco::UInt64>();
+}
+
+
+inline Poco::UInt64 operator /= (Poco::UInt64& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with Poco::UInt64
+{
+	return other /= da.convert<Poco::UInt64>();
+}
+
+
+inline const bool operator == (const Poco::UInt64& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with Poco::UInt64
+{
+	return other == da.convert<Poco::UInt64>();
+}
+
+
+inline const bool operator != (const Poco::UInt64& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with Poco::UInt64
+{
+	return other != da.convert<Poco::UInt64>();
+}
+
+
+inline const bool operator < (const Poco::UInt64& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with Poco::UInt64
+{
+	return other < da.convert<Poco::UInt64>();
+}
+
+
+inline const bool operator <= (const Poco::UInt64& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with Poco::UInt64
+{
+	return other <= da.convert<Poco::UInt64>();
+}
+
+
+inline const bool operator > (const Poco::UInt64& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with Poco::UInt64
+{
+	return other > da.convert<Poco::UInt64>();
+}
+
+
+inline const bool operator >= (const Poco::UInt64& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with Poco::UInt64
+{
+	return other >= da.convert<Poco::UInt64>();
+}
+
+
+inline const float operator + (const float& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to float
+{
+	return other + da.convert<float>();
+}
+
+
+inline const float operator - (const float& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from float
+{
+	return other - da.convert<float>();
+}
+
+
+inline const float operator * (const float& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with float
+{
+	return other * da.convert<float>();
+}
+
+
+inline const float operator / (const float& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with float
+{
+	return other / da.convert<float>();
+}
+
+
+inline float operator += (float& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to float
+{
+	return other += da.convert<float>();
+}
+
+
+inline float operator -= (float& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from float
+{
+	return other -= da.convert<float>();
+}
+
+
+inline float operator *= (float& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with float
+{
+	return other *= da.convert<float>();
+}
+
+
+inline float operator /= (float& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with float
+{
+	return other /= da.convert<float>();
+}
+
+
+inline const bool operator == (const float& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with float
+{
+	return other == da.convert<float>();
+}
+
+
+inline const bool operator != (const float& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with float
+{
+	return other != da.convert<float>();
+}
+
+
+inline const bool operator < (const float& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with float
+{
+	return other < da.convert<float>();
+}
+
+
+inline const bool operator <= (const float& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with float
+{
+	return other <= da.convert<float>();
+}
+
+
+inline const bool operator > (const float& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with float
+{
+	return other > da.convert<float>();
+}
+
+
+inline const bool operator >= (const float& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with float
+{
+	return other >= da.convert<float>();
+}
+
+
+inline const double operator + (const double& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to double
+{
+	return other + da.convert<double>();
+}
+
+
+inline const double operator - (const double& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from double
+{
+	return other - da.convert<double>();
+}
+
+
+inline const double operator * (const double& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with double
+{
+	return other * da.convert<double>();
+}
+
+
+inline const double operator / (const double& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with double
+{
+	return other / da.convert<double>();
+}
+
+
+inline double operator += (double& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to double
+{
+	return other += da.convert<double>();
+}
+
+
+inline double operator -= (double& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from double
+{
+	return other -= da.convert<double>();
+}
+
+
+inline double operator *= (double& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with double
+{
+	return other *= da.convert<double>();
+}
+
+
+inline double operator /= (double& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with double
+{
+	return other /= da.convert<double>();
+}
+
+
+inline const bool operator == (const double& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with double
+{
+	return other == da.convert<double>();
+}
+
+
+inline const bool operator != (const double& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with double
+{
+	return other != da.convert<double>();
+}
+
+
+inline const bool operator < (const double& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with double
+{
+	return other < da.convert<double>();
+}
+
+
+inline const bool operator <= (const double& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with double
+{
+	return other <= da.convert<double>();
+}
+
+
+inline const bool operator > (const double& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with double
+{
+	return other > da.convert<double>();
+}
+
+
+inline const bool operator >= (const double& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with double
+{
+	return other >= da.convert<double>();
+}
+
+
+inline const bool operator == (const bool& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with bool
+{
+	return other == da.convert<bool>();
+}
+
+
+inline const bool operator != (const bool& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with bool
+{
+	return other != da.convert<bool>();
+}
+
+
+inline const bool operator == (const std::string& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with std::string
+{
+	return other == da.convert<std::string>();
+}
+
+
+inline const bool operator != (const std::string& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with std::string
+{
+	return other != da.convert<std::string>();
+}
+
+
+inline const bool operator == (const char* other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with const char*
+{
+	return da.convert<std::string>() == other;
+}
+
+
+inline const bool operator != (const char* other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with const char*
+{
+	return da.convert<std::string>() != other;
+}
+
+
+#ifndef POCO_LONG_IS_64_BIT
+
+
+inline const long operator + (const long& other, const DynamicAny& da)
+	/// Addition operator for adding DynamicAny to long
+{
+	return other + da.convert<long>();
+}
+
+
+inline const long operator - (const long& other, const DynamicAny& da)
+	/// Subtraction operator for subtracting DynamicAny from long
+{
+	return other - da.convert<long>();
+}
+
+
+inline const long operator * (const long& other, const DynamicAny& da)
+	/// Multiplication operator for multiplying DynamicAny with long
+{
+	return other * da.convert<long>();
+}
+
+
+inline const long operator / (const long& other, const DynamicAny& da)
+	/// Division operator for dividing DynamicAny with long
+{
+	return other / da.convert<long>();
+}
+
+
+inline long operator += (long& other, const DynamicAny& da)
+	/// Addition asignment operator for adding DynamicAny to long
+{
+	return other += da.convert<long>();
+}
+
+
+inline long operator -= (long& other, const DynamicAny& da)
+	/// Subtraction asignment operator for subtracting DynamicAny from long
+{
+	return other -= da.convert<long>();
+}
+
+
+inline long operator *= (long& other, const DynamicAny& da)
+	/// Multiplication asignment operator for multiplying DynamicAny with long
+{
+	return other *= da.convert<long>();
+}
+
+
+inline long operator /= (long& other, const DynamicAny& da)
+	/// Division asignment operator for dividing DynamicAny with long
+{
+	return other /= da.convert<long>();
+}
+
+
+inline const bool operator == (const long& other, const DynamicAny& da)
+	/// Equality operator for comparing DynamicAny with long
+{
+	return other == da.convert<long>();
+}
+
+
+inline const bool operator != (const long& other, const DynamicAny& da)
+	/// Inequality operator for comparing DynamicAny with long
+{
+	return other != da.convert<long>();
+}
+
+
+inline const bool operator < (const long& other, const DynamicAny& da)
+	/// Less than operator for comparing DynamicAny with long
+{
+	return other < da.convert<long>();
+}
+
+
+inline const bool operator <= (const long& other, const DynamicAny& da)
+	/// Less than or equal operator for comparing DynamicAny with long
+{
+	return other <= da.convert<long>();
+}
+
+
+inline const bool operator > (const long& other, const DynamicAny& da)
+	/// Greater than operator for comparing DynamicAny with long
+{
+	return other > da.convert<long>();
+}
+
+
+inline const bool operator >= (const long& other, const DynamicAny& da)
+	/// Greater than or equal operator for comparing DynamicAny with long
+{
+	return other >= da.convert<long>();
+}
+
+
+#endif // POCO_LONG_IS_64_BIT
+
+
+} // namespace Poco
+
+
+#endif // Foundation_DynamicAny_INCLUDED
diff --git a/Foundation/include/Poco/DynamicAnyHolder.h b/Foundation/include/Poco/DynamicAnyHolder.h
index 6296c09fa..57c868351 100644
--- a/Foundation/include/Poco/DynamicAnyHolder.h
+++ b/Foundation/include/Poco/DynamicAnyHolder.h
@@ -1,3215 +1,3215 @@
-//
-// DynamicAnyHolder.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/DynamicAnyHolder.h#3 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  DynamicAnyHolder
-//
-// Definition of the DynamicAnyHolder class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_DynamicAnyHolder_INCLUDED
-#define Foundation_DynamicAnyHolder_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/NumberParser.h"
-#include "Poco/DateTime.h"
-#include "Poco/Timestamp.h"
-#include "Poco/LocalDateTime.h"
-#include "Poco/DateTimeFormat.h"
-#include "Poco/DateTimeFormatter.h"
-#include "Poco/DateTimeParser.h"
-#include "Poco/String.h"
-#include "Poco/Exception.h"
-#include <vector>
-#include <typeinfo>
-#undef min
-#undef max
-#include <limits>
-
-
-namespace Poco {
-
-
-class DynamicAny;
-
-
-void Foundation_API appendJSONString(std::string& val, const DynamicAny& any);
-	/// Converts the any to a JSON value and adds it to val
-
-
-class Foundation_API DynamicAnyHolder
-	/// Interface for a data holder used by the DynamicAny class. 
-	/// Provides methods to convert between data types.
-	/// Only data types for which a convert method exists are supported, which are
-	/// all C++ built-in types with addition of std::string, DateTime, LocalDateTime, Timestamp,
-	/// std::vector<DynamicAny> and DynamicStruct.
-{
-public:
-	DynamicAnyHolder();
-		/// Creates the DynamicAnyHolder.
-
-	virtual ~DynamicAnyHolder();
-		/// Destroys the DynamicAnyHolder.
-
-	virtual DynamicAnyHolder* clone() const = 0;
-		/// Deep-copies the DynamicAnyHolder.
-		
-	virtual const std::type_info& type() const = 0;
-		/// Returns the type information of the stored content.
-
-	virtual void convert(Int8& val) const = 0;
-	virtual void convert(Int16& val) const = 0;
-	virtual void convert(Int32& val) const = 0;
-	virtual void convert(Int64& val) const = 0;
-	virtual void convert(UInt8& val) const = 0;
-	virtual void convert(UInt16& val) const = 0;
-	virtual void convert(UInt32& val) const = 0;
-	virtual void convert(UInt64& val) const = 0;
-	virtual void convert(DateTime& val) const = 0;
-	virtual void convert(LocalDateTime& val) const = 0;
-	virtual void convert(Timestamp& val) const = 0;
-	virtual bool isArray() const = 0;
-	virtual bool isStruct() const = 0;
-	virtual bool isInteger() const = 0;
-	virtual bool isSigned() const = 0;
-	virtual bool isNumeric() const = 0;
-	virtual bool isString() const = 0;
-
-#ifndef POCO_LONG_IS_64_BIT
-	void convert(long& val) const;
-	void convert(unsigned long& val) const;
-#endif
-
-	virtual void convert(bool& val) const = 0;
-	virtual void convert(float& val) const = 0;
-	virtual void convert(double& val) const = 0;
-	virtual void convert(char& val) const = 0;
-	virtual void convert(std::string& val) const = 0;
-
-protected:
-	template <typename F, typename T>
-	void convertToSmaller(const F& from, T& to) const
-		/// This function is meant to convert signed numeric values from
-		/// larger to smaller type. It checks the upper and lower bound and
-		/// if from value is within limits of type T (i.e. check calls do not throw), 
-		/// it is converted.
-	{
-		poco_static_assert (std::numeric_limits<F>::is_specialized);
-		poco_static_assert (std::numeric_limits<T>::is_specialized);
-		poco_static_assert (std::numeric_limits<F>::is_signed);
-		poco_static_assert (std::numeric_limits<T>::is_signed);
-
-		if (std::numeric_limits<F>::is_integer)
-			checkUpperLimit(from, to); 
-		else
-			checkUpperLimitFloat(from, to); 
-
-		checkLowerLimit(from, to);
-		to = static_cast<T>(from);
-	}
-
-	template <typename F, typename T>
-	void convertToSmallerUnsigned(const F& from, T& to) const
-		/// This function is meant for converting unsigned integral data types,
-		/// from larger to smaller type. Since lower limit is always 0 for unigned types, 
-		/// only the upper limit is checked, thus saving some cycles compared to the signed 
-		/// version of the function. If the value to be converted is smaller than
-		/// the maximum value for the target type, the conversion is performed.
-	{
-		poco_static_assert (std::numeric_limits<F>::is_specialized);
-		poco_static_assert (std::numeric_limits<T>::is_specialized);
-		poco_static_assert (!std::numeric_limits<F>::is_signed);
-		poco_static_assert (!std::numeric_limits<T>::is_signed);
-
-		checkUpperLimit(from, to); 
-		to = static_cast<T>(from);
-	}
-
-	template <typename F, typename T>
-	void convertSignedToUnsigned(const F& from, T& to) const
-		/// This function is meant for converting signed integral data types to
-		/// unsigned data types. Negative values can not be converted and if one is 
-		/// encountered, RangeException is thrown. 
-		/// If upper limit is within the target data type limits, the conversion is performed.
-	{
-		poco_static_assert (std::numeric_limits<F>::is_specialized);
-		poco_static_assert (std::numeric_limits<T>::is_specialized);
-		poco_static_assert (std::numeric_limits<F>::is_signed);
-		poco_static_assert (!std::numeric_limits<T>::is_signed);
-
-		if (from < 0)
-			throw RangeException("Value too small.");
-		checkUpperLimit(from, to); 
-		to = static_cast<T>(from);
-	}
-
-	template <typename F, typename T>
-	void convertSignedFloatToUnsigned(const F& from, T& to) const
-		/// This function is meant for converting floating point data types to
-		/// unsigned integral data types. Negative values can not be converted and if one is 
-		/// encountered, RangeException is thrown. 
-		/// If uper limit is within the target data type limits, the conversion is performed.
-	{
-		poco_static_assert (std::numeric_limits<F>::is_specialized);
-		poco_static_assert (std::numeric_limits<T>::is_specialized);
-		poco_static_assert (!std::numeric_limits<F>::is_integer);
-		poco_static_assert (std::numeric_limits<T>::is_integer);
-		poco_static_assert (!std::numeric_limits<T>::is_signed);
-
-		if (from < 0)
-			throw RangeException("Value too small.");
-		checkUpperLimitFloat(from, to); 
-		to = static_cast<T>(from);
-	}
-
-	template <typename F, typename T>
-	void convertUnsignedToSigned(const F& from, T& to) const
-		/// This function is meant for converting unsigned integral data types to
-		/// unsigned data types. Negative values can not be converted and if one is 
-		/// encountered, RangeException is thrown. 
-		/// If upper limit is within the target data type limits, the converiosn is performed.
-	{
-		poco_static_assert (std::numeric_limits<F>::is_specialized);
-		poco_static_assert (std::numeric_limits<T>::is_specialized);
-		poco_static_assert (!std::numeric_limits<F>::is_signed);
-		poco_static_assert (std::numeric_limits<T>::is_signed);
-
-		checkUpperLimit(from, to); 
-		to = static_cast<T>(from);
-	}
-
-private:
-	template <typename F, typename T>
-	void checkUpperLimit(const F& from, T& to) const
-	{
-		if ((sizeof(T) < sizeof(F)) &&
-			(from > static_cast<F>(std::numeric_limits<T>::max())))
-		{
-			throw RangeException("Value too large.");
-		}
-		else
-		if (static_cast<T>(from) > std::numeric_limits<T>::max()) 
-		{
-			throw RangeException("Value too large.");
-		}
-	}
-
-	template <typename F, typename T>
-	void checkUpperLimitFloat(const F& from, T& to) const
-	{
-		if (from > std::numeric_limits<T>::max())
-			throw RangeException("Value too large.");
-	}
-
-	template <typename F, typename T>
-	void checkLowerLimit(const F& from, T& to) const
-	{
-		if (from < std::numeric_limits<T>::min()) 
-			throw RangeException("Value too small.");
-	}
-};
-
-
-//
-// inlines
-//
-#ifndef POCO_LONG_IS_64_BIT
-inline void DynamicAnyHolder::convert(long& val) const
-{
-	Int32 tmp;
-	convert(tmp);
-	val = tmp;
-}
-
-
-inline void DynamicAnyHolder::convert(unsigned long& val) const
-{
-	UInt32 tmp;
-	convert(tmp);
-	val = tmp;
-}
-#endif
-
-
-template <typename T>
-class DynamicAnyHolderImpl: public DynamicAnyHolder
-	/// Template based implementation of a DynamicAnyHolder. 
-	/// Conversion work happens in the template specializations of this class.
-	///
-	/// DynamicAny can be used for any type for which a specialization for
-	/// DynamicAnyHolderImpl is available.
-	///
-	/// DynamicAnyHolderImpl throws following exceptions:
-	///		NotImplementedException (if the specialization for a type does not exist)
-	///		RangeException (if an attempt is made to assign a numeric value outside of the target min/max limits
-	///		SyntaxException (if an attempt is made to convert a string containing non-numeric characters to number)
-	///
-	/// All specializations must additionally implement a public member function:
-	///     const T& value() const
-	/// returning a const reference to the actual stored value.
-{
-public:
-	DynamicAnyHolderImpl()
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(T);
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<T>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<T>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<T>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return type() == typeid(std::string);
-	}
-
-	void convert(Int8&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(Int16&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(Int32&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(Int64&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-	
-	void convert(UInt8&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(UInt16&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(UInt32&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(UInt64&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(bool&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(float&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(double&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(char&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(std::string&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(DateTime&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	bool isArray() const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-
-	bool isStruct() const
-	{
-		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
-	}
-};
-
-
-template <>
-class DynamicAnyHolderImpl<Int8>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(Int8 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(Int8);
-	}
-
-	void convert(Int8& val) const
-	{
-		val = _val;
-	}
-
-	void convert(Int16& val) const
-	{
-		val = _val;
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = _val;
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		val = static_cast<char>(_val);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("Int8 -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("Int8 -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("Int8 -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-	
-	const Int8& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<Int8>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<Int8>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<Int8>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	Int8 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<Int16>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(Int16 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(Int16);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		val = _val;
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = _val;
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("Int16 -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("Int16 -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("Int16 -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const Int16& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<Int16>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<Int16>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<Int16>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	Int16 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<Int32>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(Int32 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(Int32);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = _val;
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("Int32 -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("Int32 -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("Int32 -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const Int32& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<Int32>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<Int32>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<Int32>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	Int32 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<Int64>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(Int64 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(Int64);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime& dt) const
-	{
-		dt = Timestamp(_val);
-	}
-
-	void convert(LocalDateTime& ldt) const
-	{
-		ldt = Timestamp(_val);
-	}
-
-	void convert(Timestamp& val) const
-	{
-		val = Timestamp(_val);
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const Int64& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<Int64>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<Int64>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<Int64>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	Int64 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<UInt8>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(UInt8 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(UInt8);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = static_cast<Int32>(_val);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = static_cast<Int64>(_val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt16& val) const
-	{
-		val = _val;
-	}
-	
-	void convert(UInt32& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("UInt8 -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("Unt8 -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("UInt8 -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const UInt8& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<UInt8>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<UInt8>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<UInt8>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	UInt8 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<UInt16>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(UInt16 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(UInt16);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = static_cast<Int64>(_val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		val = _val;
-	}
-	
-	void convert(UInt32& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("UInt16 -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("UInt16 -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("UInt16 -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const UInt16& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<UInt16>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<UInt16>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<UInt16>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	UInt16 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<UInt32>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(UInt32 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(UInt32);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		val = _val;
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("UInt32 -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("UInt32 -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("UInt32 -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const UInt32& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<UInt32>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<UInt32>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<UInt32>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	UInt32 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<UInt64>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(UInt64 val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(UInt64);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val;
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime& dt) const
-	{
-		Int64 val;
-		convertUnsignedToSigned(_val, val);
-		dt = Timestamp(val);
-	}
-
-	void convert(LocalDateTime& ldt) const
-	{
-		Int64 val;
-		convertUnsignedToSigned(_val, val);
-		ldt = Timestamp(val);
-	}
-
-	void convert(Timestamp& val) const
-	{
-		Int64 tmp;
-		convertUnsignedToSigned(_val, tmp);
-		val = Timestamp(tmp);
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const UInt64& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<UInt64>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<UInt64>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<UInt64>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	UInt64 _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<bool>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(bool val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(bool);
-	}
-
-	void convert(Int8& val) const
-	{
-		val = static_cast<Int8>(_val ? 1 : 0);
-	}
-
-	void convert(Int16& val) const
-	{
-		val = static_cast<Int16>(_val ? 1 : 0);
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = static_cast<Int32>(_val ? 1 : 0);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = static_cast<Int64>(_val ? 1 : 0);
-	}
-
-	void convert(UInt8& val) const
-	{
-		val = static_cast<UInt8>(_val ? 1 : 0);
-	}
-
-	void convert(UInt16& val) const
-	{
-		val = static_cast<UInt16>(_val ? 1 : 0);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		val = static_cast<UInt32>(_val ? 1 : 0);
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = static_cast<UInt64>(_val ? 1 : 0);
-	}
-
-	void convert(bool& val) const
-	{
-		val = _val;
-	}
-
-	void convert(float& val) const
-	{
-		val = (_val ? 1.0f : 0.0f);
-	}
-
-	void convert(double& val) const
-	{
-		val = (_val ? 1.0 : 0.0);
-	}
-
-	void convert(char& val) const
-	{
-		val = static_cast<char>(_val ? 1 : 0);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = (_val ? "true" : "false");
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("bool -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("bool -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("bool -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const bool& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<bool>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<bool>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<bool>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	bool _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<float>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(float val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(float);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = !(_val <= std::numeric_limits<float>::min() && 
-			_val >= -1 * std::numeric_limits<float>::min());
-	}
-
-	void convert(float& val) const
-	{
-		val = _val;
-	}
-
-	void convert(double& val) const
-	{
-		val = _val;
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("float -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("float -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("float -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const float& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<float>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<float>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<float>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	float _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<double>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(double val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(double);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedFloatToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = !(_val <= std::numeric_limits<double>::min() && 
-			_val >= -1 * std::numeric_limits<double>::min());
-	}
-
-	void convert(float& val) const
-	{
-		double fMin = -1 * std::numeric_limits<float>::max();
-		double fMax = std::numeric_limits<float>::max();
-
-		if (_val < fMin) throw RangeException("Value too small.");
-		if (_val > fMax) throw RangeException("Value too large.");
-
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = _val;
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("double -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("double -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("double -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const double& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<double>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<double>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<double>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	double _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<char>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(char val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(char);
-	}
-
-	void convert(Int8& val) const
-	{
-		val = static_cast<Int8>(_val);
-	}
-
-	void convert(Int16& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = static_cast<UInt8>(_val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != '\0');
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		val = _val;
-	}
-
-	void convert(std::string& val) const
-	{
-		val = std::string(1, _val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("char -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("char -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("char -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const char& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<char>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<char>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<char>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	char _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<std::string>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(const char* pVal): _val(pVal)
-	{
-	}
-
-	DynamicAnyHolderImpl(const std::string& val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(std::string);
-	}
-
-	void convert(Int8& val) const
-	{
-		int v = NumberParser::parse(_val);
-		convertToSmaller(v, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		int v = NumberParser::parse(_val);
-		convertToSmaller(v, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = NumberParser::parse(_val);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = NumberParser::parse64(_val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		unsigned int v = NumberParser::parseUnsigned(_val);
-		convertToSmallerUnsigned(v, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		unsigned int v = NumberParser::parseUnsigned(_val);
-		convertToSmallerUnsigned(v, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		val = NumberParser::parseUnsigned(_val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = NumberParser::parseUnsigned64(_val);
-	}
-
-	void convert(bool& val) const
-	{
-		static const std::string VAL_FALSE("false");
-		static const std::string VAL_INTFALSE("0");
-
-		if (_val == VAL_INTFALSE || (icompare(_val, VAL_FALSE) == 0))
-			val = false;
-		else
-			val = true;
-	}
-
-	void convert(float& val) const
-	{
-		double v = NumberParser::parseFloat(_val);
-		convertToSmaller(v, val);
-	}
-
-	void convert(double& val) const
-	{
-		val = NumberParser::parseFloat(_val);
-	}
-
-	void convert(char& val) const
-	{
-		if (_val.empty())
-			val = '\0';
-		else
-			val = _val[0];
-	}
-
-	void convert(std::string& val) const
-	{
-		val = _val;
-	}
-
-	void convert(DateTime& val) const
-	{
-		int tzd = 0;
-		if (!DateTimeParser::tryParse(DateTimeFormat::ISO8601_FORMAT, _val, val, tzd))
-			throw BadCastException("string -> DateTime");
-	}
-
-	void convert(LocalDateTime& ldt) const
-	{
-		int tzd = 0;
-		DateTime tmp;
-		if (!DateTimeParser::tryParse(DateTimeFormat::ISO8601_FORMAT, _val, tmp, tzd))
-			throw BadCastException("string -> LocalDateTime");
-
-		ldt = LocalDateTime(tzd, tmp, false);
-	}
-
-	void convert(Timestamp& ts) const
-	{
-		int tzd = 0;
-		DateTime tmp;
-		if (!DateTimeParser::tryParse(DateTimeFormat::ISO8601_FORMAT, _val, tmp, tzd))
-			throw BadCastException("string -> Timestamp");
-
-		ts = tmp.timestamp();
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const std::string& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return false;
-	}
-
-	bool isSigned() const
-	{
-		return false;
-	}
-
-	bool isNumeric() const
-	{
-		return false;
-	}
-
-	bool isString() const
-	{
-		return true;
-	}
-
-private:
-	std::string _val;
-};
-
-
-#ifndef POCO_LONG_IS_64_BIT
-
-
-template <>
-class DynamicAnyHolderImpl<long>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(long val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(long);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertToSmaller(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		val = static_cast<Int32>(_val);
-	}
-
-	void convert(Int64& val) const
-	{
-		val = static_cast<Int64>(_val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		convertSignedToUnsigned(_val, val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("long -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("long -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("long -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const long& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<long>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<long>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<long>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	long _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<unsigned long>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(unsigned long val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-
-	const std::type_info& type() const
-	{
-		return typeid(unsigned long);
-	}
-
-	void convert(Int8& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int16& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-	
-	void convert(Int32& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(Int64& val) const
-	{
-		convertUnsignedToSigned(_val, val);
-	}
-
-	void convert(UInt8& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-
-	void convert(UInt16& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-	
-	void convert(UInt32& val) const
-	{
-		convertToSmallerUnsigned(_val, val);
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = static_cast<UInt64>(_val);
-	}
-
-	void convert(bool& val) const
-	{
-		val = (_val != 0);
-	}
-
-	void convert(float& val) const
-	{
-		val = static_cast<float>(_val);
-	}
-
-	void convert(double& val) const
-	{
-		val = static_cast<double>(_val);
-	}
-
-	void convert(char& val) const
-	{
-		UInt8 tmp;
-		convert(tmp);
-		val = static_cast<char>(tmp);
-	}
-
-	void convert(std::string& val) const
-	{
-		val = NumberFormatter::format(_val);
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("unsigned long -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("unsigned long -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("unsigned long -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-
-	const unsigned long& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return std::numeric_limits<unsigned long>::is_integer;
-	}
-
-	bool isSigned() const
-	{
-		return std::numeric_limits<unsigned long>::is_signed;
-	}
-
-	bool isNumeric() const
-	{
-		return std::numeric_limits<unsigned long>::is_specialized;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	unsigned long _val;
-};
-
-
-#endif // 64bit
-
-
-template <typename T>
-class DynamicAnyHolderImpl<std::vector<T> >: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(const std::vector<T>& val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(std::vector<T>);
-	}
-
-	void convert(Int8& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(Int16& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-	
-	void convert(Int32& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(Int64& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(UInt8& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(UInt16& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-	
-	void convert(UInt32& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(UInt64& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(bool& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(float& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(double& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(char& val) const
-	{
-		throw BadCastException("Cannot cast collection type to non-collection type");
-	}
-
-	void convert(std::string& val) const
-	{
-		// Serialize in JSON format: note: although this a vector<T>, the code only 
-		// supports vector<DynamicAny>. We can't make this a total specialization,
-		// because of the cyclic dependency between DynamicAny and DynamicAnyHolder
-
-		// JSON format definition: [ n times: elem ',' ], no ',' for last elem
-		val.append("[ ");
-		typename std::vector<T>::const_iterator it = _val.begin();
-		typename std::vector<T>::const_iterator itEnd = _val.end();
-		if (!_val.empty())
-		{
-			appendJSONString(val, *it);
-			++it;
-		}
-		for (; it != itEnd; ++it)
-		{
-			
-			val.append(", ");
-			appendJSONString(val, *it);
-		}
-		val.append(" ]");
-	}
-
-	void convert(DateTime&) const
-	{
-		throw BadCastException("vector -> DateTime");
-	}
-
-	void convert(LocalDateTime&) const
-	{
-		throw BadCastException("vector -> LocalDateTime");
-	}
-
-	void convert(Timestamp&) const
-	{
-		throw BadCastException("vector -> Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-	
-	const std::vector<T>& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return true;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return false;
-	}
-
-	bool isSigned() const
-	{
-		return false;
-	}
-
-	bool isNumeric() const
-	{
-		return false;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-	T& operator[](typename std::vector<T>::size_type n)
-	{
-		return _val.operator[](n);
-	}
-
-	const T& operator[](typename std::vector<T>::size_type n) const
-	{
-		return _val.operator[](n);
-	}
-
-private:
-	std::vector<T> _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<DateTime>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(const DateTime& val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(DateTime);
-	}
-
-	void convert(Int8& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(Int16& val) const
-	{
-		throw BadCastException();
-	}
-	
-	void convert(Int32& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val.timestamp().epochMicroseconds();
-	}
-
-	void convert(UInt8& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(UInt16& val) const
-	{
-		throw BadCastException();
-	}
-	
-	void convert(UInt32& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val.timestamp().epochMicroseconds();
-	}
-
-	void convert(bool&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(float&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(double&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(char&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(std::string& val) const
-	{
-		val = DateTimeFormatter::format(_val, Poco::DateTimeFormat::ISO8601_FORMAT);
-	}
-
-	void convert(DateTime& val) const
-	{
-		val = _val;
-	}
-
-	void convert(LocalDateTime& ldt) const
-	{
-		ldt = _val.timestamp();
-	}
-
-	void convert(Timestamp& ts) const
-	{
-		ts = _val.timestamp();
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-	
-	const DateTime& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return false;
-	}
-
-	bool isSigned() const
-	{
-		return false;
-	}
-
-	bool isNumeric() const
-	{
-		return false;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	DateTime _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<LocalDateTime>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(const LocalDateTime& val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(LocalDateTime);
-	}
-
-	void convert(Int8& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(Int16& val) const
-	{
-		throw BadCastException();
-	}
-	
-	void convert(Int32& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val.timestamp().epochMicroseconds();
-	}
-
-	void convert(UInt8& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(UInt16& val) const
-	{
-		throw BadCastException();
-	}
-	
-	void convert(UInt32& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val.timestamp().epochMicroseconds();
-	}
-
-	void convert(bool&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(float&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(double&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(char&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(std::string& val) const
-	{
-		val = DateTimeFormatter::format(_val, Poco::DateTimeFormat::ISO8601_FORMAT);
-	}
-
-	void convert(DateTime& val) const
-	{
-		val = _val.timestamp();
-	}
-
-	void convert(LocalDateTime& ldt) const
-	{
-		ldt = _val;
-	}
-
-	void convert(Timestamp& ts) const
-	{
-		ts = _val.timestamp();
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-	
-	const LocalDateTime& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return false;
-	}
-
-	bool isSigned() const
-	{
-		return false;
-	}
-
-	bool isNumeric() const
-	{
-		return false;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	LocalDateTime _val;
-};
-
-
-template <>
-class DynamicAnyHolderImpl<Timestamp>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(const Timestamp& val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(Timestamp);
-	}
-
-	void convert(Int8& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(Int16& val) const
-	{
-		throw BadCastException();
-	}
-	
-	void convert(Int32& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(Int64& val) const
-	{
-		val = _val.epochMicroseconds();
-	}
-
-	void convert(UInt8& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(UInt16& val) const
-	{
-		throw BadCastException();
-	}
-	
-	void convert(UInt32& val) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(UInt64& val) const
-	{
-		val = _val.epochMicroseconds();
-	}
-
-	void convert(bool&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(float&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(double&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(char&) const
-	{
-		throw BadCastException();
-	}
-
-	void convert(std::string& val) const
-	{
-		val = DateTimeFormatter::format(_val, Poco::DateTimeFormat::ISO8601_FORMAT);
-	}
-
-	void convert(DateTime& val) const
-	{
-		val = _val;
-	}
-
-	void convert(LocalDateTime& ldt) const
-	{
-		ldt = _val;
-	}
-
-	void convert(Timestamp& ts) const
-	{
-		ts = _val;
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-	
-	const Timestamp& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return false;
-	}
-
-	bool isInteger() const
-	{
-		return false;
-	}
-
-	bool isSigned() const
-	{
-		return false;
-	}
-
-	bool isNumeric() const
-	{
-		return false;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-private:
-	Timestamp _val;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_DynamicAnyHolder_INCLUDED
+//
+// DynamicAnyHolder.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/DynamicAnyHolder.h#3 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  DynamicAnyHolder
+//
+// Definition of the DynamicAnyHolder class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_DynamicAnyHolder_INCLUDED
+#define Foundation_DynamicAnyHolder_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/NumberFormatter.h"
+#include "Poco/NumberParser.h"
+#include "Poco/DateTime.h"
+#include "Poco/Timestamp.h"
+#include "Poco/LocalDateTime.h"
+#include "Poco/DateTimeFormat.h"
+#include "Poco/DateTimeFormatter.h"
+#include "Poco/DateTimeParser.h"
+#include "Poco/String.h"
+#include "Poco/Exception.h"
+#include <vector>
+#include <typeinfo>
+#undef min
+#undef max
+#include <limits>
+
+
+namespace Poco {
+
+
+class DynamicAny;
+
+
+void Foundation_API appendJSONString(std::string& val, const DynamicAny& any);
+	/// Converts the any to a JSON value and adds it to val
+
+
+class Foundation_API DynamicAnyHolder
+	/// Interface for a data holder used by the DynamicAny class. 
+	/// Provides methods to convert between data types.
+	/// Only data types for which a convert method exists are supported, which are
+	/// all C++ built-in types with addition of std::string, DateTime, LocalDateTime, Timestamp,
+	/// std::vector<DynamicAny> and DynamicStruct.
+{
+public:
+	DynamicAnyHolder();
+		/// Creates the DynamicAnyHolder.
+
+	virtual ~DynamicAnyHolder();
+		/// Destroys the DynamicAnyHolder.
+
+	virtual DynamicAnyHolder* clone() const = 0;
+		/// Deep-copies the DynamicAnyHolder.
+		
+	virtual const std::type_info& type() const = 0;
+		/// Returns the type information of the stored content.
+
+	virtual void convert(Int8& val) const = 0;
+	virtual void convert(Int16& val) const = 0;
+	virtual void convert(Int32& val) const = 0;
+	virtual void convert(Int64& val) const = 0;
+	virtual void convert(UInt8& val) const = 0;
+	virtual void convert(UInt16& val) const = 0;
+	virtual void convert(UInt32& val) const = 0;
+	virtual void convert(UInt64& val) const = 0;
+	virtual void convert(DateTime& val) const = 0;
+	virtual void convert(LocalDateTime& val) const = 0;
+	virtual void convert(Timestamp& val) const = 0;
+	virtual bool isArray() const = 0;
+	virtual bool isStruct() const = 0;
+	virtual bool isInteger() const = 0;
+	virtual bool isSigned() const = 0;
+	virtual bool isNumeric() const = 0;
+	virtual bool isString() const = 0;
+
+#ifndef POCO_LONG_IS_64_BIT
+	void convert(long& val) const;
+	void convert(unsigned long& val) const;
+#endif
+
+	virtual void convert(bool& val) const = 0;
+	virtual void convert(float& val) const = 0;
+	virtual void convert(double& val) const = 0;
+	virtual void convert(char& val) const = 0;
+	virtual void convert(std::string& val) const = 0;
+
+protected:
+	template <typename F, typename T>
+	void convertToSmaller(const F& from, T& to) const
+		/// This function is meant to convert signed numeric values from
+		/// larger to smaller type. It checks the upper and lower bound and
+		/// if from value is within limits of type T (i.e. check calls do not throw), 
+		/// it is converted.
+	{
+		poco_static_assert (std::numeric_limits<F>::is_specialized);
+		poco_static_assert (std::numeric_limits<T>::is_specialized);
+		poco_static_assert (std::numeric_limits<F>::is_signed);
+		poco_static_assert (std::numeric_limits<T>::is_signed);
+
+		if (std::numeric_limits<F>::is_integer)
+			checkUpperLimit(from, to); 
+		else
+			checkUpperLimitFloat(from, to); 
+
+		checkLowerLimit(from, to);
+		to = static_cast<T>(from);
+	}
+
+	template <typename F, typename T>
+	void convertToSmallerUnsigned(const F& from, T& to) const
+		/// This function is meant for converting unsigned integral data types,
+		/// from larger to smaller type. Since lower limit is always 0 for unigned types, 
+		/// only the upper limit is checked, thus saving some cycles compared to the signed 
+		/// version of the function. If the value to be converted is smaller than
+		/// the maximum value for the target type, the conversion is performed.
+	{
+		poco_static_assert (std::numeric_limits<F>::is_specialized);
+		poco_static_assert (std::numeric_limits<T>::is_specialized);
+		poco_static_assert (!std::numeric_limits<F>::is_signed);
+		poco_static_assert (!std::numeric_limits<T>::is_signed);
+
+		checkUpperLimit(from, to); 
+		to = static_cast<T>(from);
+	}
+
+	template <typename F, typename T>
+	void convertSignedToUnsigned(const F& from, T& to) const
+		/// This function is meant for converting signed integral data types to
+		/// unsigned data types. Negative values can not be converted and if one is 
+		/// encountered, RangeException is thrown. 
+		/// If upper limit is within the target data type limits, the conversion is performed.
+	{
+		poco_static_assert (std::numeric_limits<F>::is_specialized);
+		poco_static_assert (std::numeric_limits<T>::is_specialized);
+		poco_static_assert (std::numeric_limits<F>::is_signed);
+		poco_static_assert (!std::numeric_limits<T>::is_signed);
+
+		if (from < 0)
+			throw RangeException("Value too small.");
+		checkUpperLimit(from, to); 
+		to = static_cast<T>(from);
+	}
+
+	template <typename F, typename T>
+	void convertSignedFloatToUnsigned(const F& from, T& to) const
+		/// This function is meant for converting floating point data types to
+		/// unsigned integral data types. Negative values can not be converted and if one is 
+		/// encountered, RangeException is thrown. 
+		/// If uper limit is within the target data type limits, the conversion is performed.
+	{
+		poco_static_assert (std::numeric_limits<F>::is_specialized);
+		poco_static_assert (std::numeric_limits<T>::is_specialized);
+		poco_static_assert (!std::numeric_limits<F>::is_integer);
+		poco_static_assert (std::numeric_limits<T>::is_integer);
+		poco_static_assert (!std::numeric_limits<T>::is_signed);
+
+		if (from < 0)
+			throw RangeException("Value too small.");
+		checkUpperLimitFloat(from, to); 
+		to = static_cast<T>(from);
+	}
+
+	template <typename F, typename T>
+	void convertUnsignedToSigned(const F& from, T& to) const
+		/// This function is meant for converting unsigned integral data types to
+		/// unsigned data types. Negative values can not be converted and if one is 
+		/// encountered, RangeException is thrown. 
+		/// If upper limit is within the target data type limits, the converiosn is performed.
+	{
+		poco_static_assert (std::numeric_limits<F>::is_specialized);
+		poco_static_assert (std::numeric_limits<T>::is_specialized);
+		poco_static_assert (!std::numeric_limits<F>::is_signed);
+		poco_static_assert (std::numeric_limits<T>::is_signed);
+
+		checkUpperLimit(from, to); 
+		to = static_cast<T>(from);
+	}
+
+private:
+	template <typename F, typename T>
+	void checkUpperLimit(const F& from, T& to) const
+	{
+		if ((sizeof(T) < sizeof(F)) &&
+			(from > static_cast<F>(std::numeric_limits<T>::max())))
+		{
+			throw RangeException("Value too large.");
+		}
+		else
+		if (static_cast<T>(from) > std::numeric_limits<T>::max()) 
+		{
+			throw RangeException("Value too large.");
+		}
+	}
+
+	template <typename F, typename T>
+	void checkUpperLimitFloat(const F& from, T& to) const
+	{
+		if (from > std::numeric_limits<T>::max())
+			throw RangeException("Value too large.");
+	}
+
+	template <typename F, typename T>
+	void checkLowerLimit(const F& from, T& to) const
+	{
+		if (from < std::numeric_limits<T>::min()) 
+			throw RangeException("Value too small.");
+	}
+};
+
+
+//
+// inlines
+//
+#ifndef POCO_LONG_IS_64_BIT
+inline void DynamicAnyHolder::convert(long& val) const
+{
+	Int32 tmp;
+	convert(tmp);
+	val = tmp;
+}
+
+
+inline void DynamicAnyHolder::convert(unsigned long& val) const
+{
+	UInt32 tmp;
+	convert(tmp);
+	val = tmp;
+}
+#endif
+
+
+template <typename T>
+class DynamicAnyHolderImpl: public DynamicAnyHolder
+	/// Template based implementation of a DynamicAnyHolder. 
+	/// Conversion work happens in the template specializations of this class.
+	///
+	/// DynamicAny can be used for any type for which a specialization for
+	/// DynamicAnyHolderImpl is available.
+	///
+	/// DynamicAnyHolderImpl throws following exceptions:
+	///		NotImplementedException (if the specialization for a type does not exist)
+	///		RangeException (if an attempt is made to assign a numeric value outside of the target min/max limits
+	///		SyntaxException (if an attempt is made to convert a string containing non-numeric characters to number)
+	///
+	/// All specializations must additionally implement a public member function:
+	///     const T& value() const
+	/// returning a const reference to the actual stored value.
+{
+public:
+	DynamicAnyHolderImpl()
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(T);
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<T>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<T>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<T>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return type() == typeid(std::string);
+	}
+
+	void convert(Int8&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(Int16&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(Int32&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(Int64&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+	
+	void convert(UInt8&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(UInt16&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(UInt32&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(UInt64&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(bool&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(float&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(double&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(char&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(std::string&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(DateTime&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	bool isArray() const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+
+	bool isStruct() const
+	{
+		throw NotImplementedException("No DynamicAnyHolder specialization for type", typeid(T).name());
+	}
+};
+
+
+template <>
+class DynamicAnyHolderImpl<Int8>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(Int8 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(Int8);
+	}
+
+	void convert(Int8& val) const
+	{
+		val = _val;
+	}
+
+	void convert(Int16& val) const
+	{
+		val = _val;
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = _val;
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		val = static_cast<char>(_val);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("Int8 -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("Int8 -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("Int8 -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+	
+	const Int8& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<Int8>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<Int8>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<Int8>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	Int8 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<Int16>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(Int16 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(Int16);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		val = _val;
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = _val;
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("Int16 -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("Int16 -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("Int16 -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const Int16& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<Int16>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<Int16>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<Int16>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	Int16 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<Int32>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(Int32 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(Int32);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = _val;
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("Int32 -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("Int32 -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("Int32 -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const Int32& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<Int32>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<Int32>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<Int32>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	Int32 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<Int64>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(Int64 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(Int64);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime& dt) const
+	{
+		dt = Timestamp(_val);
+	}
+
+	void convert(LocalDateTime& ldt) const
+	{
+		ldt = Timestamp(_val);
+	}
+
+	void convert(Timestamp& val) const
+	{
+		val = Timestamp(_val);
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const Int64& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<Int64>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<Int64>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<Int64>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	Int64 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<UInt8>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(UInt8 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(UInt8);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = static_cast<Int32>(_val);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = static_cast<Int64>(_val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt16& val) const
+	{
+		val = _val;
+	}
+	
+	void convert(UInt32& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("UInt8 -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("Unt8 -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("UInt8 -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const UInt8& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<UInt8>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<UInt8>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<UInt8>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	UInt8 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<UInt16>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(UInt16 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(UInt16);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = static_cast<Int64>(_val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		val = _val;
+	}
+	
+	void convert(UInt32& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("UInt16 -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("UInt16 -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("UInt16 -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const UInt16& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<UInt16>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<UInt16>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<UInt16>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	UInt16 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<UInt32>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(UInt32 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(UInt32);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		val = _val;
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("UInt32 -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("UInt32 -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("UInt32 -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const UInt32& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<UInt32>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<UInt32>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<UInt32>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	UInt32 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<UInt64>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(UInt64 val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(UInt64);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val;
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime& dt) const
+	{
+		Int64 val;
+		convertUnsignedToSigned(_val, val);
+		dt = Timestamp(val);
+	}
+
+	void convert(LocalDateTime& ldt) const
+	{
+		Int64 val;
+		convertUnsignedToSigned(_val, val);
+		ldt = Timestamp(val);
+	}
+
+	void convert(Timestamp& val) const
+	{
+		Int64 tmp;
+		convertUnsignedToSigned(_val, tmp);
+		val = Timestamp(tmp);
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const UInt64& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<UInt64>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<UInt64>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<UInt64>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	UInt64 _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<bool>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(bool val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(bool);
+	}
+
+	void convert(Int8& val) const
+	{
+		val = static_cast<Int8>(_val ? 1 : 0);
+	}
+
+	void convert(Int16& val) const
+	{
+		val = static_cast<Int16>(_val ? 1 : 0);
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = static_cast<Int32>(_val ? 1 : 0);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = static_cast<Int64>(_val ? 1 : 0);
+	}
+
+	void convert(UInt8& val) const
+	{
+		val = static_cast<UInt8>(_val ? 1 : 0);
+	}
+
+	void convert(UInt16& val) const
+	{
+		val = static_cast<UInt16>(_val ? 1 : 0);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		val = static_cast<UInt32>(_val ? 1 : 0);
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = static_cast<UInt64>(_val ? 1 : 0);
+	}
+
+	void convert(bool& val) const
+	{
+		val = _val;
+	}
+
+	void convert(float& val) const
+	{
+		val = (_val ? 1.0f : 0.0f);
+	}
+
+	void convert(double& val) const
+	{
+		val = (_val ? 1.0 : 0.0);
+	}
+
+	void convert(char& val) const
+	{
+		val = static_cast<char>(_val ? 1 : 0);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = (_val ? "true" : "false");
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("bool -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("bool -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("bool -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const bool& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<bool>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<bool>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<bool>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	bool _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<float>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(float val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(float);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = !(_val <= std::numeric_limits<float>::min() && 
+			_val >= -1 * std::numeric_limits<float>::min());
+	}
+
+	void convert(float& val) const
+	{
+		val = _val;
+	}
+
+	void convert(double& val) const
+	{
+		val = _val;
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("float -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("float -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("float -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const float& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<float>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<float>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<float>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	float _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<double>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(double val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(double);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedFloatToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = !(_val <= std::numeric_limits<double>::min() && 
+			_val >= -1 * std::numeric_limits<double>::min());
+	}
+
+	void convert(float& val) const
+	{
+		double fMin = -1 * std::numeric_limits<float>::max();
+		double fMax = std::numeric_limits<float>::max();
+
+		if (_val < fMin) throw RangeException("Value too small.");
+		if (_val > fMax) throw RangeException("Value too large.");
+
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = _val;
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("double -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("double -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("double -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const double& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<double>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<double>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<double>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	double _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<char>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(char val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(char);
+	}
+
+	void convert(Int8& val) const
+	{
+		val = static_cast<Int8>(_val);
+	}
+
+	void convert(Int16& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = static_cast<UInt8>(_val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != '\0');
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		val = _val;
+	}
+
+	void convert(std::string& val) const
+	{
+		val = std::string(1, _val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("char -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("char -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("char -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const char& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<char>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<char>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<char>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	char _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<std::string>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(const char* pVal): _val(pVal)
+	{
+	}
+
+	DynamicAnyHolderImpl(const std::string& val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(std::string);
+	}
+
+	void convert(Int8& val) const
+	{
+		int v = NumberParser::parse(_val);
+		convertToSmaller(v, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		int v = NumberParser::parse(_val);
+		convertToSmaller(v, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = NumberParser::parse(_val);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = NumberParser::parse64(_val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		unsigned int v = NumberParser::parseUnsigned(_val);
+		convertToSmallerUnsigned(v, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		unsigned int v = NumberParser::parseUnsigned(_val);
+		convertToSmallerUnsigned(v, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		val = NumberParser::parseUnsigned(_val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = NumberParser::parseUnsigned64(_val);
+	}
+
+	void convert(bool& val) const
+	{
+		static const std::string VAL_FALSE("false");
+		static const std::string VAL_INTFALSE("0");
+
+		if (_val == VAL_INTFALSE || (icompare(_val, VAL_FALSE) == 0))
+			val = false;
+		else
+			val = true;
+	}
+
+	void convert(float& val) const
+	{
+		double v = NumberParser::parseFloat(_val);
+		convertToSmaller(v, val);
+	}
+
+	void convert(double& val) const
+	{
+		val = NumberParser::parseFloat(_val);
+	}
+
+	void convert(char& val) const
+	{
+		if (_val.empty())
+			val = '\0';
+		else
+			val = _val[0];
+	}
+
+	void convert(std::string& val) const
+	{
+		val = _val;
+	}
+
+	void convert(DateTime& val) const
+	{
+		int tzd = 0;
+		if (!DateTimeParser::tryParse(DateTimeFormat::ISO8601_FORMAT, _val, val, tzd))
+			throw BadCastException("string -> DateTime");
+	}
+
+	void convert(LocalDateTime& ldt) const
+	{
+		int tzd = 0;
+		DateTime tmp;
+		if (!DateTimeParser::tryParse(DateTimeFormat::ISO8601_FORMAT, _val, tmp, tzd))
+			throw BadCastException("string -> LocalDateTime");
+
+		ldt = LocalDateTime(tzd, tmp, false);
+	}
+
+	void convert(Timestamp& ts) const
+	{
+		int tzd = 0;
+		DateTime tmp;
+		if (!DateTimeParser::tryParse(DateTimeFormat::ISO8601_FORMAT, _val, tmp, tzd))
+			throw BadCastException("string -> Timestamp");
+
+		ts = tmp.timestamp();
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const std::string& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return false;
+	}
+
+	bool isSigned() const
+	{
+		return false;
+	}
+
+	bool isNumeric() const
+	{
+		return false;
+	}
+
+	bool isString() const
+	{
+		return true;
+	}
+
+private:
+	std::string _val;
+};
+
+
+#ifndef POCO_LONG_IS_64_BIT
+
+
+template <>
+class DynamicAnyHolderImpl<long>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(long val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(long);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertToSmaller(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		val = static_cast<Int32>(_val);
+	}
+
+	void convert(Int64& val) const
+	{
+		val = static_cast<Int64>(_val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		convertSignedToUnsigned(_val, val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("long -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("long -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("long -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const long& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<long>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<long>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<long>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	long _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<unsigned long>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(unsigned long val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+
+	const std::type_info& type() const
+	{
+		return typeid(unsigned long);
+	}
+
+	void convert(Int8& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int16& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+	
+	void convert(Int32& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(Int64& val) const
+	{
+		convertUnsignedToSigned(_val, val);
+	}
+
+	void convert(UInt8& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+
+	void convert(UInt16& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+	
+	void convert(UInt32& val) const
+	{
+		convertToSmallerUnsigned(_val, val);
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = static_cast<UInt64>(_val);
+	}
+
+	void convert(bool& val) const
+	{
+		val = (_val != 0);
+	}
+
+	void convert(float& val) const
+	{
+		val = static_cast<float>(_val);
+	}
+
+	void convert(double& val) const
+	{
+		val = static_cast<double>(_val);
+	}
+
+	void convert(char& val) const
+	{
+		UInt8 tmp;
+		convert(tmp);
+		val = static_cast<char>(tmp);
+	}
+
+	void convert(std::string& val) const
+	{
+		val = NumberFormatter::format(_val);
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("unsigned long -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("unsigned long -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("unsigned long -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+
+	const unsigned long& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return std::numeric_limits<unsigned long>::is_integer;
+	}
+
+	bool isSigned() const
+	{
+		return std::numeric_limits<unsigned long>::is_signed;
+	}
+
+	bool isNumeric() const
+	{
+		return std::numeric_limits<unsigned long>::is_specialized;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	unsigned long _val;
+};
+
+
+#endif // 64bit
+
+
+template <typename T>
+class DynamicAnyHolderImpl<std::vector<T> >: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(const std::vector<T>& val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(std::vector<T>);
+	}
+
+	void convert(Int8& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(Int16& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+	
+	void convert(Int32& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(Int64& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(UInt8& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(UInt16& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+	
+	void convert(UInt32& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(UInt64& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(bool& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(float& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(double& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(char& val) const
+	{
+		throw BadCastException("Cannot cast collection type to non-collection type");
+	}
+
+	void convert(std::string& val) const
+	{
+		// Serialize in JSON format: note: although this a vector<T>, the code only 
+		// supports vector<DynamicAny>. We can't make this a total specialization,
+		// because of the cyclic dependency between DynamicAny and DynamicAnyHolder
+
+		// JSON format definition: [ n times: elem ',' ], no ',' for last elem
+		val.append("[ ");
+		typename std::vector<T>::const_iterator it = _val.begin();
+		typename std::vector<T>::const_iterator itEnd = _val.end();
+		if (!_val.empty())
+		{
+			appendJSONString(val, *it);
+			++it;
+		}
+		for (; it != itEnd; ++it)
+		{
+			
+			val.append(", ");
+			appendJSONString(val, *it);
+		}
+		val.append(" ]");
+	}
+
+	void convert(DateTime&) const
+	{
+		throw BadCastException("vector -> DateTime");
+	}
+
+	void convert(LocalDateTime&) const
+	{
+		throw BadCastException("vector -> LocalDateTime");
+	}
+
+	void convert(Timestamp&) const
+	{
+		throw BadCastException("vector -> Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+	
+	const std::vector<T>& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return true;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return false;
+	}
+
+	bool isSigned() const
+	{
+		return false;
+	}
+
+	bool isNumeric() const
+	{
+		return false;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+	T& operator[](typename std::vector<T>::size_type n)
+	{
+		return _val.operator[](n);
+	}
+
+	const T& operator[](typename std::vector<T>::size_type n) const
+	{
+		return _val.operator[](n);
+	}
+
+private:
+	std::vector<T> _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<DateTime>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(const DateTime& val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(DateTime);
+	}
+
+	void convert(Int8& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(Int16& val) const
+	{
+		throw BadCastException();
+	}
+	
+	void convert(Int32& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val.timestamp().epochMicroseconds();
+	}
+
+	void convert(UInt8& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(UInt16& val) const
+	{
+		throw BadCastException();
+	}
+	
+	void convert(UInt32& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val.timestamp().epochMicroseconds();
+	}
+
+	void convert(bool&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(float&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(double&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(char&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(std::string& val) const
+	{
+		val = DateTimeFormatter::format(_val, Poco::DateTimeFormat::ISO8601_FORMAT);
+	}
+
+	void convert(DateTime& val) const
+	{
+		val = _val;
+	}
+
+	void convert(LocalDateTime& ldt) const
+	{
+		ldt = _val.timestamp();
+	}
+
+	void convert(Timestamp& ts) const
+	{
+		ts = _val.timestamp();
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+	
+	const DateTime& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return false;
+	}
+
+	bool isSigned() const
+	{
+		return false;
+	}
+
+	bool isNumeric() const
+	{
+		return false;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	DateTime _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<LocalDateTime>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(const LocalDateTime& val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(LocalDateTime);
+	}
+
+	void convert(Int8& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(Int16& val) const
+	{
+		throw BadCastException();
+	}
+	
+	void convert(Int32& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val.timestamp().epochMicroseconds();
+	}
+
+	void convert(UInt8& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(UInt16& val) const
+	{
+		throw BadCastException();
+	}
+	
+	void convert(UInt32& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val.timestamp().epochMicroseconds();
+	}
+
+	void convert(bool&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(float&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(double&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(char&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(std::string& val) const
+	{
+		val = DateTimeFormatter::format(_val, Poco::DateTimeFormat::ISO8601_FORMAT);
+	}
+
+	void convert(DateTime& val) const
+	{
+		val = _val.timestamp();
+	}
+
+	void convert(LocalDateTime& ldt) const
+	{
+		ldt = _val;
+	}
+
+	void convert(Timestamp& ts) const
+	{
+		ts = _val.timestamp();
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+	
+	const LocalDateTime& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return false;
+	}
+
+	bool isSigned() const
+	{
+		return false;
+	}
+
+	bool isNumeric() const
+	{
+		return false;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	LocalDateTime _val;
+};
+
+
+template <>
+class DynamicAnyHolderImpl<Timestamp>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(const Timestamp& val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(Timestamp);
+	}
+
+	void convert(Int8& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(Int16& val) const
+	{
+		throw BadCastException();
+	}
+	
+	void convert(Int32& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(Int64& val) const
+	{
+		val = _val.epochMicroseconds();
+	}
+
+	void convert(UInt8& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(UInt16& val) const
+	{
+		throw BadCastException();
+	}
+	
+	void convert(UInt32& val) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(UInt64& val) const
+	{
+		val = _val.epochMicroseconds();
+	}
+
+	void convert(bool&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(float&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(double&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(char&) const
+	{
+		throw BadCastException();
+	}
+
+	void convert(std::string& val) const
+	{
+		val = DateTimeFormatter::format(_val, Poco::DateTimeFormat::ISO8601_FORMAT);
+	}
+
+	void convert(DateTime& val) const
+	{
+		val = _val;
+	}
+
+	void convert(LocalDateTime& ldt) const
+	{
+		ldt = _val;
+	}
+
+	void convert(Timestamp& ts) const
+	{
+		ts = _val;
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+	
+	const Timestamp& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return false;
+	}
+
+	bool isInteger() const
+	{
+		return false;
+	}
+
+	bool isSigned() const
+	{
+		return false;
+	}
+
+	bool isNumeric() const
+	{
+		return false;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+private:
+	Timestamp _val;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_DynamicAnyHolder_INCLUDED
diff --git a/Foundation/include/Poco/DynamicStruct.h b/Foundation/include/Poco/DynamicStruct.h
index 664afcd8e..f181e2283 100644
--- a/Foundation/include/Poco/DynamicStruct.h
+++ b/Foundation/include/Poco/DynamicStruct.h
@@ -1,399 +1,399 @@
-//
-// DynamicStruct.h
-//
-// $Id: //poco/Main/Foundation/include/Poco/DynamicStruct.h#9 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  DynamicStruct
-//
-// Definition of the DynamicStruct class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_DynamicStruct_INCLUDED
-#define Foundation_DynamicStruct_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/DynamicAnyHolder.h"
-#include <map>
-#include <set>
-
-
-namespace Poco {
-
-
-class Foundation_API DynamicStruct
-	/// DynamicStruct allows to define a named collection of DynamicAny objects.
-{
-public:
-	typedef std::map<std::string, DynamicAny> Data;
-	typedef Data::iterator Iterator;
-	typedef Data::const_iterator ConstIterator;
-
-	DynamicStruct();
-		/// Creates an empty DynamicStruct
-
-	DynamicStruct(const Data &val);
-		/// Creates the DynamicStruct from the given value.
-	
-	virtual ~DynamicStruct();
-		/// Destroys the DynamicStruct.
-
-	DynamicAny& operator [] (const std::string& name);
-		/// Returns the DynamicAny with the given name, creates an entry if not found.
-
-	const DynamicAny& operator [] (const std::string& name) const;
-		/// Returns the DynamicAny with the given name, throws a
-		/// NotFoundException if the data member is not found.
-
-	bool contains(const std::string& name) const;
-		/// Returns true if the DynamicStruct contains a member with the given 
-		/// name
-
-	Iterator find(const std::string& name);
-		/// Returns an iterator, pointing to the <name,DynamicAny> pair containing
-		/// the element, or it returns end() if the member was not found
-
-	ConstIterator find(const std::string& name) const;
-		/// Returns a const iterator, pointing to the <name,DynamicAny> pair containing
-		/// the element, or it returns end() if the member was not found
-
-	Iterator end();
-		/// Returns the end iterator for the DynamicStruct
-
-	ConstIterator end() const;
-		/// Returns the end const iterator for the DynamicStruct
-
-	Iterator begin();
-		/// Returns the begin iterator for the DynamicStruct
-
-	ConstIterator begin() const;
-		/// Returns the begin const iterator for the DynamicStruct
-
-	std::pair<DynamicStruct::Iterator, bool> insert(const std::string& key, const DynamicAny& value);
-		/// Inserts a <name, DynamicAny> pair into the DynamicStruct,
-		/// returns a pair containing the iterator and a boolean which
-		/// indicates success or not (is true, when insert succeeded, false,
-		/// when already another element was present, in this case Iterator
-		/// points to that other element)
-
-	std::pair<DynamicStruct::Iterator, bool> insert(const DynamicStruct::Data::value_type& aPair);
-		/// Inserts a <name, DynamicAny> pair into the DynamicStruct,
-		/// returns a pair containing the iterator and a boolean which
-		/// indicates success or not (is true, when insert succeeded, false,
-		/// when already another element was present, in this case Iterator
-		/// points to that other element)
-
-	DynamicStruct::Data::size_type erase(const std::string& key);
-		/// Erases the element if found, returns number of elements deleted
-
-	void erase(DynamicStruct::Iterator it);
-		/// Erases the element at the given position
-
-	bool empty() const;
-		/// Returns true if the DynamicStruct doesn't contain any members
-
-	DynamicStruct::Data::size_type size() const;
-		/// Returns the number of members the DynamicStruct contains
-
-	std::set<std::string> members() const;
-		/// Returns a sorted collection containing all member names
-
-private:
-	Data _data;
-};
-
-
-//
-// inlines
-//
-inline DynamicAny& DynamicStruct::operator [] (const std::string& name)
-{
-	return _data[name];
-}
-
-
-inline bool DynamicStruct::contains(const std::string& name) const
-{
-	return find(name) != end();
-}
-
-
-inline DynamicStruct::Iterator DynamicStruct::find(const std::string& name)
-{
-	return _data.find(name);
-}
-
-
-inline DynamicStruct::ConstIterator DynamicStruct::find(const std::string& name) const
-{
-	return _data.find(name);
-}
-
-
-inline DynamicStruct::Iterator DynamicStruct::end()
-{
-	return _data.end();
-}
-
-
-inline DynamicStruct::ConstIterator DynamicStruct::end() const
-{
-	return _data.end();
-}
-
-
-inline DynamicStruct::Iterator DynamicStruct::begin()
-{
-	return _data.begin();
-}
-
-
-inline DynamicStruct::ConstIterator DynamicStruct::begin() const
-{
-	return _data.begin();
-}
-
-
-inline std::pair<DynamicStruct::Iterator, bool> DynamicStruct::insert(const std::string& key, const DynamicAny& value)
-{
-	return insert(std::make_pair(key, value));
-}
-
-
-inline std::pair<DynamicStruct::Iterator, bool> DynamicStruct::insert(const DynamicStruct::Data::value_type& aPair)
-{
-	return _data.insert(aPair);
-}
-
-
-inline DynamicStruct::Data::size_type DynamicStruct::erase(const std::string& key)
-{
-	return _data.erase(key);
-}
-
-
-inline void DynamicStruct::erase(DynamicStruct::Iterator it)
-{
-	_data.erase(it);
-}
-
-
-inline bool DynamicStruct::empty() const
-{
-	return _data.empty();
-}
-
-
-inline DynamicStruct::Data::size_type DynamicStruct::size() const
-{
-	return _data.size();
-}
-
-
-template <>
-class DynamicAnyHolderImpl<DynamicStruct>: public DynamicAnyHolder
-{
-public:
-	DynamicAnyHolderImpl(const DynamicStruct& val): _val(val)
-	{
-	}
-
-	~DynamicAnyHolderImpl()
-	{
-	}
-	
-	const std::type_info& type() const
-	{
-		return typeid(DynamicStruct);
-	}
-
-	void convert(Int8& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to Int8");
-	}
-
-	void convert(Int16& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to Int16");
-	}
-	
-	void convert(Int32& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to Int32");
-	}
-
-	void convert(Int64& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to Int64");
-	}
-
-	void convert(UInt8& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to UInt8");
-	}
-
-	void convert(UInt16& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to UInt16");
-	}
-	
-	void convert(UInt32& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to UInt32");
-	}
-
-	void convert(UInt64& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to UInt64");
-	}
-
-	void convert(bool& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to bool");
-	}
-
-	void convert(float& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to float");
-	}
-
-	void convert(double& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to double");
-	}
-
-	void convert(char& val) const
-	{
-		throw BadCastException("Cannot cast DynamicStruct type to char");
-	}
-
-	void convert(std::string& val) const
-	{
-		// Serialize in JSON format: equals an object
-
-		// JSON format definition: { string ':' value } string:value pair n-times, sep. by ','
-		val.append("{ ");
-		DynamicStruct::ConstIterator it = _val.begin();
-		DynamicStruct::ConstIterator itEnd = _val.end();
-		if (!_val.empty())
-		{
-			DynamicAny key(it->first);
-			appendJSONString(val, key);
-			val.append(" : ");
-			appendJSONString(val, it->second);
-			++it;
-		}
-		for (; it != itEnd; ++it)
-		{
-			val.append(", ");
-			DynamicAny key(it->first);
-			appendJSONString(val, key);
-			val.append(" : ");
-			appendJSONString(val, it->second);
-		}
-		val.append(" }");	
-	}
-
-	void convert(Poco::DateTime&) const
-	{
-		throw BadCastException("DynamicStruct -> Poco::DateTime");
-	}
-
-	void convert(Poco::LocalDateTime&) const
-	{
-		throw BadCastException("DynamicStruct -> Poco::LocalDateTime");
-	}
-
-	void convert(Poco::Timestamp&) const
-	{
-		throw BadCastException("DynamicStruct -> Poco::Timestamp");
-	}
-
-	DynamicAnyHolder* clone() const
-	{
-		return new DynamicAnyHolderImpl(_val);
-	}
-	
-	const DynamicStruct& value() const
-	{
-		return _val;
-	}
-
-	bool isArray() const
-	{
-		return false;
-	}
-
-	bool isStruct() const
-	{
-		return true;
-	}
-
-	bool isInteger() const
-	{
-		return false;
-	}
-
-	bool isSigned() const
-	{
-		return false;
-	}
-
-	bool isNumeric() const
-	{
-		return false;
-	}
-
-	bool isString() const
-	{
-		return false;
-	}
-
-	DynamicAny& operator [] (const std::string& name)
-	{
-		return _val[name];
-	}
-
-	const DynamicAny& operator [] (const std::string& name) const
-	{
-		return _val[name];
-	}
-
-private:
-	DynamicStruct _val;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_DynamicStruct_INCLUDED
+//
+// DynamicStruct.h
+//
+// $Id: //poco/Main/Foundation/include/Poco/DynamicStruct.h#9 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  DynamicStruct
+//
+// Definition of the DynamicStruct class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_DynamicStruct_INCLUDED
+#define Foundation_DynamicStruct_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/DynamicAny.h"
+#include "Poco/DynamicAnyHolder.h"
+#include <map>
+#include <set>
+
+
+namespace Poco {
+
+
+class Foundation_API DynamicStruct
+	/// DynamicStruct allows to define a named collection of DynamicAny objects.
+{
+public:
+	typedef std::map<std::string, DynamicAny> Data;
+	typedef Data::iterator Iterator;
+	typedef Data::const_iterator ConstIterator;
+
+	DynamicStruct();
+		/// Creates an empty DynamicStruct
+
+	DynamicStruct(const Data &val);
+		/// Creates the DynamicStruct from the given value.
+	
+	virtual ~DynamicStruct();
+		/// Destroys the DynamicStruct.
+
+	DynamicAny& operator [] (const std::string& name);
+		/// Returns the DynamicAny with the given name, creates an entry if not found.
+
+	const DynamicAny& operator [] (const std::string& name) const;
+		/// Returns the DynamicAny with the given name, throws a
+		/// NotFoundException if the data member is not found.
+
+	bool contains(const std::string& name) const;
+		/// Returns true if the DynamicStruct contains a member with the given 
+		/// name
+
+	Iterator find(const std::string& name);
+		/// Returns an iterator, pointing to the <name,DynamicAny> pair containing
+		/// the element, or it returns end() if the member was not found
+
+	ConstIterator find(const std::string& name) const;
+		/// Returns a const iterator, pointing to the <name,DynamicAny> pair containing
+		/// the element, or it returns end() if the member was not found
+
+	Iterator end();
+		/// Returns the end iterator for the DynamicStruct
+
+	ConstIterator end() const;
+		/// Returns the end const iterator for the DynamicStruct
+
+	Iterator begin();
+		/// Returns the begin iterator for the DynamicStruct
+
+	ConstIterator begin() const;
+		/// Returns the begin const iterator for the DynamicStruct
+
+	std::pair<DynamicStruct::Iterator, bool> insert(const std::string& key, const DynamicAny& value);
+		/// Inserts a <name, DynamicAny> pair into the DynamicStruct,
+		/// returns a pair containing the iterator and a boolean which
+		/// indicates success or not (is true, when insert succeeded, false,
+		/// when already another element was present, in this case Iterator
+		/// points to that other element)
+
+	std::pair<DynamicStruct::Iterator, bool> insert(const DynamicStruct::Data::value_type& aPair);
+		/// Inserts a <name, DynamicAny> pair into the DynamicStruct,
+		/// returns a pair containing the iterator and a boolean which
+		/// indicates success or not (is true, when insert succeeded, false,
+		/// when already another element was present, in this case Iterator
+		/// points to that other element)
+
+	DynamicStruct::Data::size_type erase(const std::string& key);
+		/// Erases the element if found, returns number of elements deleted
+
+	void erase(DynamicStruct::Iterator it);
+		/// Erases the element at the given position
+
+	bool empty() const;
+		/// Returns true if the DynamicStruct doesn't contain any members
+
+	DynamicStruct::Data::size_type size() const;
+		/// Returns the number of members the DynamicStruct contains
+
+	std::set<std::string> members() const;
+		/// Returns a sorted collection containing all member names
+
+private:
+	Data _data;
+};
+
+
+//
+// inlines
+//
+inline DynamicAny& DynamicStruct::operator [] (const std::string& name)
+{
+	return _data[name];
+}
+
+
+inline bool DynamicStruct::contains(const std::string& name) const
+{
+	return find(name) != end();
+}
+
+
+inline DynamicStruct::Iterator DynamicStruct::find(const std::string& name)
+{
+	return _data.find(name);
+}
+
+
+inline DynamicStruct::ConstIterator DynamicStruct::find(const std::string& name) const
+{
+	return _data.find(name);
+}
+
+
+inline DynamicStruct::Iterator DynamicStruct::end()
+{
+	return _data.end();
+}
+
+
+inline DynamicStruct::ConstIterator DynamicStruct::end() const
+{
+	return _data.end();
+}
+
+
+inline DynamicStruct::Iterator DynamicStruct::begin()
+{
+	return _data.begin();
+}
+
+
+inline DynamicStruct::ConstIterator DynamicStruct::begin() const
+{
+	return _data.begin();
+}
+
+
+inline std::pair<DynamicStruct::Iterator, bool> DynamicStruct::insert(const std::string& key, const DynamicAny& value)
+{
+	return insert(std::make_pair(key, value));
+}
+
+
+inline std::pair<DynamicStruct::Iterator, bool> DynamicStruct::insert(const DynamicStruct::Data::value_type& aPair)
+{
+	return _data.insert(aPair);
+}
+
+
+inline DynamicStruct::Data::size_type DynamicStruct::erase(const std::string& key)
+{
+	return _data.erase(key);
+}
+
+
+inline void DynamicStruct::erase(DynamicStruct::Iterator it)
+{
+	_data.erase(it);
+}
+
+
+inline bool DynamicStruct::empty() const
+{
+	return _data.empty();
+}
+
+
+inline DynamicStruct::Data::size_type DynamicStruct::size() const
+{
+	return _data.size();
+}
+
+
+template <>
+class DynamicAnyHolderImpl<DynamicStruct>: public DynamicAnyHolder
+{
+public:
+	DynamicAnyHolderImpl(const DynamicStruct& val): _val(val)
+	{
+	}
+
+	~DynamicAnyHolderImpl()
+	{
+	}
+	
+	const std::type_info& type() const
+	{
+		return typeid(DynamicStruct);
+	}
+
+	void convert(Int8& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to Int8");
+	}
+
+	void convert(Int16& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to Int16");
+	}
+	
+	void convert(Int32& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to Int32");
+	}
+
+	void convert(Int64& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to Int64");
+	}
+
+	void convert(UInt8& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to UInt8");
+	}
+
+	void convert(UInt16& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to UInt16");
+	}
+	
+	void convert(UInt32& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to UInt32");
+	}
+
+	void convert(UInt64& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to UInt64");
+	}
+
+	void convert(bool& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to bool");
+	}
+
+	void convert(float& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to float");
+	}
+
+	void convert(double& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to double");
+	}
+
+	void convert(char& val) const
+	{
+		throw BadCastException("Cannot cast DynamicStruct type to char");
+	}
+
+	void convert(std::string& val) const
+	{
+		// Serialize in JSON format: equals an object
+
+		// JSON format definition: { string ':' value } string:value pair n-times, sep. by ','
+		val.append("{ ");
+		DynamicStruct::ConstIterator it = _val.begin();
+		DynamicStruct::ConstIterator itEnd = _val.end();
+		if (!_val.empty())
+		{
+			DynamicAny key(it->first);
+			appendJSONString(val, key);
+			val.append(" : ");
+			appendJSONString(val, it->second);
+			++it;
+		}
+		for (; it != itEnd; ++it)
+		{
+			val.append(", ");
+			DynamicAny key(it->first);
+			appendJSONString(val, key);
+			val.append(" : ");
+			appendJSONString(val, it->second);
+		}
+		val.append(" }");	
+	}
+
+	void convert(Poco::DateTime&) const
+	{
+		throw BadCastException("DynamicStruct -> Poco::DateTime");
+	}
+
+	void convert(Poco::LocalDateTime&) const
+	{
+		throw BadCastException("DynamicStruct -> Poco::LocalDateTime");
+	}
+
+	void convert(Poco::Timestamp&) const
+	{
+		throw BadCastException("DynamicStruct -> Poco::Timestamp");
+	}
+
+	DynamicAnyHolder* clone() const
+	{
+		return new DynamicAnyHolderImpl(_val);
+	}
+	
+	const DynamicStruct& value() const
+	{
+		return _val;
+	}
+
+	bool isArray() const
+	{
+		return false;
+	}
+
+	bool isStruct() const
+	{
+		return true;
+	}
+
+	bool isInteger() const
+	{
+		return false;
+	}
+
+	bool isSigned() const
+	{
+		return false;
+	}
+
+	bool isNumeric() const
+	{
+		return false;
+	}
+
+	bool isString() const
+	{
+		return false;
+	}
+
+	DynamicAny& operator [] (const std::string& name)
+	{
+		return _val[name];
+	}
+
+	const DynamicAny& operator [] (const std::string& name) const
+	{
+		return _val[name];
+	}
+
+private:
+	DynamicStruct _val;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_DynamicStruct_INCLUDED
diff --git a/Foundation/include/Poco/ExpirationDecorator.h b/Foundation/include/Poco/ExpirationDecorator.h
index 3a630f467..b2c78fe3f 100644
--- a/Foundation/include/Poco/ExpirationDecorator.h
+++ b/Foundation/include/Poco/ExpirationDecorator.h
@@ -1,114 +1,114 @@
-//
-// ExpirationDecorator.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/ExpirationDecorator.h#2 $
-//
-// Library: Foundation
-// Package: Events
-// Module:  ExpirationDecorator
-//
-// Implementation of the ExpirationDecorator template.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_ExpirationDecorator_INCLUDED
-#define  Foundation_ExpirationDecorator_INCLUDED
-
-
-#include "Poco/Timestamp.h"
-#include "Poco/Timespan.h"
-
-
-namespace Poco {
-
-
-template <typename TArgs>
-class ExpirationDecorator
-	/// ExpirationDecorator adds an expiration method to values so that they can be used
-	/// with the UniqueExpireCache
-{
-public:
-	ExpirationDecorator():
-		_value(),
-		_expiresAt()
-	{
-	}
-
-	ExpirationDecorator(const TArgs& p, const Poco::Timespan::TimeDiff& diffInMs):
-			/// Creates an element that will expire in diff milliseconds
-		_value(p),
-		_expiresAt()
-	{
-		_expiresAt += (diffInMs*1000);
-	}
-
-	ExpirationDecorator(const TArgs& p, const Poco::Timespan& timeSpan):
-		/// Creates an element that will expire after the given timeSpan
-		_value(p),
-		_expiresAt()
-	{
-		_expiresAt += timeSpan.totalMicroseconds();
-	}
-
-	ExpirationDecorator(const TArgs& p, const Poco::Timestamp& timeStamp):
-		/// Creates an element that will expire at the given time point
-		_value(p),
-		_expiresAt(timeStamp)
-	{
-	}
-
-
-	~ExpirationDecorator()
-	{
-	}
-	
-	const Poco::Timestamp& getExpiration() const
-	{
-		return _expiresAt;
-	}
-
-	const TArgs& value() const
-	{
-		return _value;
-	}
-
-	TArgs& value()
-	{
-		return _value;
-	}
-
-private:
-	TArgs     _value;
-	Timestamp _expiresAt;
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// ExpirationDecorator.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/ExpirationDecorator.h#2 $
+//
+// Library: Foundation
+// Package: Events
+// Module:  ExpirationDecorator
+//
+// Implementation of the ExpirationDecorator template.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_ExpirationDecorator_INCLUDED
+#define  Foundation_ExpirationDecorator_INCLUDED
+
+
+#include "Poco/Timestamp.h"
+#include "Poco/Timespan.h"
+
+
+namespace Poco {
+
+
+template <typename TArgs>
+class ExpirationDecorator
+	/// ExpirationDecorator adds an expiration method to values so that they can be used
+	/// with the UniqueExpireCache
+{
+public:
+	ExpirationDecorator():
+		_value(),
+		_expiresAt()
+	{
+	}
+
+	ExpirationDecorator(const TArgs& p, const Poco::Timespan::TimeDiff& diffInMs):
+			/// Creates an element that will expire in diff milliseconds
+		_value(p),
+		_expiresAt()
+	{
+		_expiresAt += (diffInMs*1000);
+	}
+
+	ExpirationDecorator(const TArgs& p, const Poco::Timespan& timeSpan):
+		/// Creates an element that will expire after the given timeSpan
+		_value(p),
+		_expiresAt()
+	{
+		_expiresAt += timeSpan.totalMicroseconds();
+	}
+
+	ExpirationDecorator(const TArgs& p, const Poco::Timestamp& timeStamp):
+		/// Creates an element that will expire at the given time point
+		_value(p),
+		_expiresAt(timeStamp)
+	{
+	}
+
+
+	~ExpirationDecorator()
+	{
+	}
+	
+	const Poco::Timestamp& getExpiration() const
+	{
+		return _expiresAt;
+	}
+
+	const TArgs& value() const
+	{
+		return _value;
+	}
+
+	TArgs& value()
+	{
+		return _value;
+	}
+
+private:
+	TArgs     _value;
+	Timestamp _expiresAt;
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/FileStream.h b/Foundation/include/Poco/FileStream.h
index 1ab56d2bf..ddb3b3e6a 100644
--- a/Foundation/include/Poco/FileStream.h
+++ b/Foundation/include/Poco/FileStream.h
@@ -1,194 +1,194 @@
-//
-// FileStream.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/FileStream.h#2 $
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_FileStream_INCLUDED
-#define Foundation_FileStream_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#if defined(POCO_OS_FAMILY_WINDOWS)
-#include "FileStream_WIN32.h"
-#else
-#include "FileStream_POSIX.h"
-#endif
-#include <istream>
-#include <ostream>
-
-
-namespace Poco {
-
-
-class Foundation_API FileIOS: public virtual std::ios
-	/// The base class for FileInputStream and FileOutputStream.
-	///
-	/// This class is needed to ensure the correct initialization
-	/// order of the stream buffer and base classes.
-	///
-	/// Files are always opened in binary mode, a text mode
-	/// with CR-LF translation is not supported. Thus, the
-	/// file is always opened as if the std::ios::binary flag
-	/// was specified.
-	/// Use an InputLineEndingConverter or OutputLineEndingConverter
-	/// if you require CR-LF translation.
-	///
-	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
-	/// UTF-8 encoded Unicode paths are correctly handled.
-{
-public:
-	FileIOS(std::ios::openmode defaultMode);
-		/// Creates the basic stream.
-		
-	~FileIOS();
-		/// Destroys the stream.
-
-	void open(const std::string& path, std::ios::openmode mode);
-		/// Opens the file specified by path, using the given mode.
-		///
-		/// Throws a FileException (or a similar exception) if the file 
-		/// does not exist or is not accessible for other reasons and
-		/// a new file cannot be created.
-
-	void close();
-		/// Closes the file stream.
-
-	FileStreamBuf* rdbuf();
-		/// Returns a pointer to the underlying streambuf.
-
-protected:
-	FileStreamBuf _buf;
-	std::ios::openmode _defaultMode;
-};
-
-
-class Foundation_API FileInputStream: public FileIOS, public std::istream
-	/// An input stream for reading from a file.
-	///
-	/// Files are always opened in binary mode, a text mode
-	/// with CR-LF translation is not supported. Thus, the
-	/// file is always opened as if the std::ios::binary flag
-	/// was specified.
-	/// Use an InputLineEndingConverter if you require CR-LF translation.
-	///
-	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
-	/// UTF-8 encoded Unicode paths are correctly handled.
-{
-public:
-	FileInputStream();
-		/// Creates an unopened FileInputStream.
-	
-	FileInputStream(const std::string& path, std::ios::openmode mode = std::ios::in);
-		/// Creates the FileInputStream for the file given by path, using
-		/// the given mode.
-		///
-		/// The std::ios::in flag is always set, regardless of the actual
-		/// value specified for mode.
-		///
-		/// Throws a FileNotFoundException (or a similar exception) if the file 
-		/// does not exist or is not accessible for other reasons.
-
-	~FileInputStream();
-		/// Destroys the stream.
-};
-
-
-class Foundation_API FileOutputStream: public FileIOS, public std::ostream
-	/// An output stream for writing to a file.
-	///
-	/// Files are always opened in binary mode, a text mode
-	/// with CR-LF translation is not supported. Thus, the
-	/// file is always opened as if the std::ios::binary flag
-	/// was specified.
-	/// Use an OutputLineEndingConverter if you require CR-LF translation.
-	///
-	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
-	/// UTF-8 encoded Unicode paths are correctly handled.
-{
-public:
-	FileOutputStream();
-		/// Creats an unopened FileOutputStream.
-		
-	FileOutputStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::trunc);
-		/// Creates the FileOutputStream for the file given by path, using
-		/// the given mode.
-		///
-		/// The std::ios::out is always set, regardless of the actual 
-		/// value specified for mode.
-		///
-		/// Throws a FileException (or a similar exception) if the file 
-		/// does not exist or is not accessible for other reasons and
-		/// a new file cannot be created.
-
-	~FileOutputStream();
-		/// Destroys the FileOutputStream.
-};
-
-
-class Foundation_API FileStream: public FileIOS, public std::iostream
-	/// A stream for reading from and writing to a file.
-	///
-	/// Files are always opened in binary mode, a text mode
-	/// with CR-LF translation is not supported. Thus, the
-	/// file is always opened as if the std::ios::binary flag
-	/// was specified.
-	/// Use an InputLineEndingConverter or OutputLineEndingConverter
-	/// if you require CR-LF translation.
-	///
-	/// A seek (seekg() or seekp()) operation will always set the 
-	/// read position and the write position simultaneously to the
-	/// same value.
-	///
-	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
-	/// UTF-8 encoded Unicode paths are correctly handled.
-{
-public:
-	FileStream();
-		/// Creats an unopened FileStream.
-	
-	FileStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::in);
-		/// Creates the FileStream for the file given by path, using
-		/// the given mode.
-
-	~FileStream();
-		/// Destroys the FileOutputStream.
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_FileStream_INCLUDED
+//
+// FileStream.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/FileStream.h#2 $
+//
+// Library: Foundation
+// Package: Streams
+// Module:  FileStream
+//
+// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_FileStream_INCLUDED
+#define Foundation_FileStream_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#if defined(POCO_OS_FAMILY_WINDOWS)
+#include "FileStream_WIN32.h"
+#else
+#include "FileStream_POSIX.h"
+#endif
+#include <istream>
+#include <ostream>
+
+
+namespace Poco {
+
+
+class Foundation_API FileIOS: public virtual std::ios
+	/// The base class for FileInputStream and FileOutputStream.
+	///
+	/// This class is needed to ensure the correct initialization
+	/// order of the stream buffer and base classes.
+	///
+	/// Files are always opened in binary mode, a text mode
+	/// with CR-LF translation is not supported. Thus, the
+	/// file is always opened as if the std::ios::binary flag
+	/// was specified.
+	/// Use an InputLineEndingConverter or OutputLineEndingConverter
+	/// if you require CR-LF translation.
+	///
+	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
+	/// UTF-8 encoded Unicode paths are correctly handled.
+{
+public:
+	FileIOS(std::ios::openmode defaultMode);
+		/// Creates the basic stream.
+		
+	~FileIOS();
+		/// Destroys the stream.
+
+	void open(const std::string& path, std::ios::openmode mode);
+		/// Opens the file specified by path, using the given mode.
+		///
+		/// Throws a FileException (or a similar exception) if the file 
+		/// does not exist or is not accessible for other reasons and
+		/// a new file cannot be created.
+
+	void close();
+		/// Closes the file stream.
+
+	FileStreamBuf* rdbuf();
+		/// Returns a pointer to the underlying streambuf.
+
+protected:
+	FileStreamBuf _buf;
+	std::ios::openmode _defaultMode;
+};
+
+
+class Foundation_API FileInputStream: public FileIOS, public std::istream
+	/// An input stream for reading from a file.
+	///
+	/// Files are always opened in binary mode, a text mode
+	/// with CR-LF translation is not supported. Thus, the
+	/// file is always opened as if the std::ios::binary flag
+	/// was specified.
+	/// Use an InputLineEndingConverter if you require CR-LF translation.
+	///
+	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
+	/// UTF-8 encoded Unicode paths are correctly handled.
+{
+public:
+	FileInputStream();
+		/// Creates an unopened FileInputStream.
+	
+	FileInputStream(const std::string& path, std::ios::openmode mode = std::ios::in);
+		/// Creates the FileInputStream for the file given by path, using
+		/// the given mode.
+		///
+		/// The std::ios::in flag is always set, regardless of the actual
+		/// value specified for mode.
+		///
+		/// Throws a FileNotFoundException (or a similar exception) if the file 
+		/// does not exist or is not accessible for other reasons.
+
+	~FileInputStream();
+		/// Destroys the stream.
+};
+
+
+class Foundation_API FileOutputStream: public FileIOS, public std::ostream
+	/// An output stream for writing to a file.
+	///
+	/// Files are always opened in binary mode, a text mode
+	/// with CR-LF translation is not supported. Thus, the
+	/// file is always opened as if the std::ios::binary flag
+	/// was specified.
+	/// Use an OutputLineEndingConverter if you require CR-LF translation.
+	///
+	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
+	/// UTF-8 encoded Unicode paths are correctly handled.
+{
+public:
+	FileOutputStream();
+		/// Creats an unopened FileOutputStream.
+		
+	FileOutputStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::trunc);
+		/// Creates the FileOutputStream for the file given by path, using
+		/// the given mode.
+		///
+		/// The std::ios::out is always set, regardless of the actual 
+		/// value specified for mode.
+		///
+		/// Throws a FileException (or a similar exception) if the file 
+		/// does not exist or is not accessible for other reasons and
+		/// a new file cannot be created.
+
+	~FileOutputStream();
+		/// Destroys the FileOutputStream.
+};
+
+
+class Foundation_API FileStream: public FileIOS, public std::iostream
+	/// A stream for reading from and writing to a file.
+	///
+	/// Files are always opened in binary mode, a text mode
+	/// with CR-LF translation is not supported. Thus, the
+	/// file is always opened as if the std::ios::binary flag
+	/// was specified.
+	/// Use an InputLineEndingConverter or OutputLineEndingConverter
+	/// if you require CR-LF translation.
+	///
+	/// A seek (seekg() or seekp()) operation will always set the 
+	/// read position and the write position simultaneously to the
+	/// same value.
+	///
+	/// On Windows platforms, if POCO_WIN32_UTF8 is #define'd,
+	/// UTF-8 encoded Unicode paths are correctly handled.
+{
+public:
+	FileStream();
+		/// Creats an unopened FileStream.
+	
+	FileStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::in);
+		/// Creates the FileStream for the file given by path, using
+		/// the given mode.
+
+	~FileStream();
+		/// Destroys the FileOutputStream.
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_FileStream_INCLUDED
diff --git a/Foundation/include/Poco/FileStream_POSIX.h b/Foundation/include/Poco/FileStream_POSIX.h
index be8aab771..b93dbb693 100644
--- a/Foundation/include/Poco/FileStream_POSIX.h
+++ b/Foundation/include/Poco/FileStream_POSIX.h
@@ -1,93 +1,93 @@
-//
-// FileStream_POSIX.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/FileStream_POSIX.h#2 $
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_FileStream_POSIX_INCLUDED
-#define Foundation_FileStream_POSIX_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/BufferedBidirectionalStreamBuf.h"
-#include <istream>
-#include <ostream>
-
-
-namespace Poco {
-
-
-class Foundation_API FileStreamBuf: public BufferedBidirectionalStreamBuf
-	/// This stream buffer handles Fileio
-{
-public:
-	FileStreamBuf();
-		/// Creates a FileStreamBuf.
-		
-	~FileStreamBuf();
-		/// Destroys the FileStream.
-
-	void open(const std::string& path, std::ios::openmode mode);
-		/// Opens the given file in the given mode.
-
-	void close();
-		/// Closes the File stream buffer.
-
-	std::streampos seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode = std::ios::in | std::ios::out);
-		/// Change position by offset, according to way and mode.
-
-	std::streampos seekpos(std::streampos pos, std::ios::openmode mode = std::ios::in | std::ios::out);
-		/// Change to specified position, according to mode.
-
-protected:
-	enum
-	{
-		BUFFER_SIZE = 4096
-	};
-
-	int readFromDevice(char* buffer, std::streamsize length);
-	int writeToDevice(const char* buffer, std::streamsize length);
-
-private:
-	std::string _path;
-	int _fd;
-	std::streamoff _pos;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_FileStream_WIN32_INCLUDED
+//
+// FileStream_POSIX.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/FileStream_POSIX.h#2 $
+//
+// Library: Foundation
+// Package: Streams
+// Module:  FileStream
+//
+// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_FileStream_POSIX_INCLUDED
+#define Foundation_FileStream_POSIX_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/BufferedBidirectionalStreamBuf.h"
+#include <istream>
+#include <ostream>
+
+
+namespace Poco {
+
+
+class Foundation_API FileStreamBuf: public BufferedBidirectionalStreamBuf
+	/// This stream buffer handles Fileio
+{
+public:
+	FileStreamBuf();
+		/// Creates a FileStreamBuf.
+		
+	~FileStreamBuf();
+		/// Destroys the FileStream.
+
+	void open(const std::string& path, std::ios::openmode mode);
+		/// Opens the given file in the given mode.
+
+	void close();
+		/// Closes the File stream buffer.
+
+	std::streampos seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode = std::ios::in | std::ios::out);
+		/// Change position by offset, according to way and mode.
+
+	std::streampos seekpos(std::streampos pos, std::ios::openmode mode = std::ios::in | std::ios::out);
+		/// Change to specified position, according to mode.
+
+protected:
+	enum
+	{
+		BUFFER_SIZE = 4096
+	};
+
+	int readFromDevice(char* buffer, std::streamsize length);
+	int writeToDevice(const char* buffer, std::streamsize length);
+
+private:
+	std::string _path;
+	int _fd;
+	std::streamoff _pos;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_FileStream_WIN32_INCLUDED
diff --git a/Foundation/include/Poco/FileStream_WIN32.h b/Foundation/include/Poco/FileStream_WIN32.h
index 9fc7cd701..1b53f3dbe 100644
--- a/Foundation/include/Poco/FileStream_WIN32.h
+++ b/Foundation/include/Poco/FileStream_WIN32.h
@@ -1,92 +1,92 @@
-//
-// FileStream_WIN32.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/FileStream_WIN32.h#2 $
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_FileStream_WIN32_INCLUDED
-#define Foundation_FileStream_WIN32_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/BufferedBidirectionalStreamBuf.h"
-#include "Poco/UnWindows.h"
-
-
-namespace Poco {
-
-
-class Foundation_API FileStreamBuf: public BufferedBidirectionalStreamBuf
-	/// This stream buffer handles Fileio
-{
-public:
-	FileStreamBuf();
-		/// Creates a FileStreamBuf.
-
-	~FileStreamBuf();
-		/// Destroys the FileStream.
-
-	void open(const std::string& path, std::ios::openmode mode);
-		/// Opens the given file in the given mode.
-
-	void close();
-		/// Closes the File stream buffer
-
-	std::streampos seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode = std::ios::in | std::ios::out);
-		/// change position by offset, according to way and mode
-
-	std::streampos seekpos(std::streampos pos, std::ios::openmode mode = std::ios::in | std::ios::out);
-		/// change to specified position, according to mode
-
-protected:
-	enum
-	{
-		BUFFER_SIZE = 4096
-	};
-
-	int readFromDevice(char* buffer, std::streamsize length);
-	int writeToDevice(const char* buffer, std::streamsize length);
-
-private:
-	std::string _path;
-	HANDLE _handle;
-	UInt64 _pos;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_FileStream_WIN32_INCLUDED
+//
+// FileStream_WIN32.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/FileStream_WIN32.h#2 $
+//
+// Library: Foundation
+// Package: Streams
+// Module:  FileStream
+//
+// Definition of the FileStreamBuf, FileInputStream and FileOutputStream classes.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_FileStream_WIN32_INCLUDED
+#define Foundation_FileStream_WIN32_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/BufferedBidirectionalStreamBuf.h"
+#include "Poco/UnWindows.h"
+
+
+namespace Poco {
+
+
+class Foundation_API FileStreamBuf: public BufferedBidirectionalStreamBuf
+	/// This stream buffer handles Fileio
+{
+public:
+	FileStreamBuf();
+		/// Creates a FileStreamBuf.
+
+	~FileStreamBuf();
+		/// Destroys the FileStream.
+
+	void open(const std::string& path, std::ios::openmode mode);
+		/// Opens the given file in the given mode.
+
+	void close();
+		/// Closes the File stream buffer
+
+	std::streampos seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode = std::ios::in | std::ios::out);
+		/// change position by offset, according to way and mode
+
+	std::streampos seekpos(std::streampos pos, std::ios::openmode mode = std::ios::in | std::ios::out);
+		/// change to specified position, according to mode
+
+protected:
+	enum
+	{
+		BUFFER_SIZE = 4096
+	};
+
+	int readFromDevice(char* buffer, std::streamsize length);
+	int writeToDevice(const char* buffer, std::streamsize length);
+
+private:
+	std::string _path;
+	HANDLE _handle;
+	UInt64 _pos;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_FileStream_WIN32_INCLUDED
diff --git a/Foundation/include/Poco/FunctionDelegate.h b/Foundation/include/Poco/FunctionDelegate.h
index 819205cea..8b989265c 100644
--- a/Foundation/include/Poco/FunctionDelegate.h
+++ b/Foundation/include/Poco/FunctionDelegate.h
@@ -1,208 +1,208 @@
-//
-// FunctionDelegate.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/FunctionDelegate.h#2 $
-//
-// Library: Foundation
-// Package: Events
-// Module:  FunctionDelegate
-//
-// Implementation of the FunctionDelegate template.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_FunctionDelegate_INCLUDED
-#define  Foundation_FunctionDelegate_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/AbstractDelegate.h"
-
-
-namespace Poco {
-
-
-template <class TArgs, bool hasSender = true, bool senderIsConst = true> 
-class FunctionDelegate: public AbstractDelegate<TArgs>
-	/// Wraps a C style function (or a C++ static fucntion) to be used as
-	/// a delegate
-{
-public:
-	typedef void (*NotifyMethod)(const void*, TArgs&);
-
-	FunctionDelegate(NotifyMethod method):
-		AbstractDelegate<TArgs>(*reinterpret_cast<void**>(&method)),
-		_receiverMethod(method)
-	{
-	}
-
-	FunctionDelegate(const FunctionDelegate& delegate):
-		AbstractDelegate<TArgs>(delegate),
-		_receiverMethod(delegate._receiverMethod)
-	{
-	}
-
-	~FunctionDelegate()
-	{
-	}
-	
-	FunctionDelegate& operator = (const FunctionDelegate& delegate)
-	{
-		if (&delegate != this)
-		{
-			this->_pTarget        = delegate._pTarget;
-			this->_receiverMethod = delegate._receiverMethod;
-		}
-		return *this;
-	}
-
-	bool notify(const void* sender, TArgs& arguments)
-	{
-		(*_receiverMethod)(sender, arguments);
-		return true; // a "standard" delegate never expires
-	}
-
-	AbstractDelegate<TArgs>* clone() const
-	{
-		return new FunctionDelegate(*this);
-	}
-
-protected:
-	NotifyMethod _receiverMethod;
-
-private:
-	FunctionDelegate();
-};
-
-
-template <class TArgs> 
-class FunctionDelegate<TArgs, true, false>: public AbstractDelegate<TArgs>
-{
-public:
-	typedef void (*NotifyMethod)(void*, TArgs&);
-
-	FunctionDelegate(NotifyMethod method):
-		AbstractDelegate<TArgs>(*reinterpret_cast<void**>(&method)),
-		_receiverMethod(method)
-	{
-	}
-
-	FunctionDelegate(const FunctionDelegate& delegate):
-		AbstractDelegate<TArgs>(delegate),
-		_receiverMethod(delegate._receiverMethod)
-	{
-	}
-
-	~FunctionDelegate()
-	{
-	}
-	
-	FunctionDelegate& operator = (const FunctionDelegate& delegate)
-	{
-		if (&delegate != this)
-		{
-			this->_pTarget        = delegate._pTarget;
-			this->_receiverMethod = delegate._receiverMethod;
-		}
-		return *this;
-	}
-
-	bool notify(const void* sender, TArgs& arguments)
-	{
-		(*_receiverMethod)(const_cast<void*>(sender), arguments);
-		return true; // a "standard" delegate never expires
-	}
-
-	AbstractDelegate<TArgs>* clone() const
-	{
-		return new FunctionDelegate(*this);
-	}
-
-protected:
-	NotifyMethod _receiverMethod;
-
-private:
-	FunctionDelegate();
-};
-
-
-template <class TArgs, bool senderIsConst> 
-class FunctionDelegate<TArgs, false, senderIsConst>: public AbstractDelegate<TArgs>
-{
-public:
-	typedef void (*NotifyMethod)(TArgs&);
-
-	FunctionDelegate(NotifyMethod method):
-		AbstractDelegate<TArgs>(*reinterpret_cast<void**>(&method)),
-		_receiverMethod(method)
-	{
-	}
-
-	FunctionDelegate(const FunctionDelegate& delegate):
-		AbstractDelegate<TArgs>(delegate),
-		_receiverMethod(delegate._receiverMethod)
-	{
-	}
-
-	~FunctionDelegate()
-	{
-	}
-	
-	FunctionDelegate& operator = (const FunctionDelegate& delegate)
-	{
-		if (&delegate != this)
-		{
-			this->_pTarget        = delegate._pTarget;
-			this->_receiverMethod = delegate._receiverMethod;
-		}
-		return *this;
-	}
-
-	bool notify(const void* sender, TArgs& arguments)
-	{
-		(*_receiverMethod)(arguments);
-		return true; // a "standard" delegate never expires
-	}
-
-	AbstractDelegate<TArgs>* clone() const
-	{
-		return new FunctionDelegate(*this);
-	}
-
-protected:
-	NotifyMethod _receiverMethod;
-
-private:
-	FunctionDelegate();
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// FunctionDelegate.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/FunctionDelegate.h#2 $
+//
+// Library: Foundation
+// Package: Events
+// Module:  FunctionDelegate
+//
+// Implementation of the FunctionDelegate template.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_FunctionDelegate_INCLUDED
+#define  Foundation_FunctionDelegate_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/AbstractDelegate.h"
+
+
+namespace Poco {
+
+
+template <class TArgs, bool hasSender = true, bool senderIsConst = true> 
+class FunctionDelegate: public AbstractDelegate<TArgs>
+	/// Wraps a C style function (or a C++ static fucntion) to be used as
+	/// a delegate
+{
+public:
+	typedef void (*NotifyMethod)(const void*, TArgs&);
+
+	FunctionDelegate(NotifyMethod method):
+		AbstractDelegate<TArgs>(*reinterpret_cast<void**>(&method)),
+		_receiverMethod(method)
+	{
+	}
+
+	FunctionDelegate(const FunctionDelegate& delegate):
+		AbstractDelegate<TArgs>(delegate),
+		_receiverMethod(delegate._receiverMethod)
+	{
+	}
+
+	~FunctionDelegate()
+	{
+	}
+	
+	FunctionDelegate& operator = (const FunctionDelegate& delegate)
+	{
+		if (&delegate != this)
+		{
+			this->_pTarget        = delegate._pTarget;
+			this->_receiverMethod = delegate._receiverMethod;
+		}
+		return *this;
+	}
+
+	bool notify(const void* sender, TArgs& arguments)
+	{
+		(*_receiverMethod)(sender, arguments);
+		return true; // a "standard" delegate never expires
+	}
+
+	AbstractDelegate<TArgs>* clone() const
+	{
+		return new FunctionDelegate(*this);
+	}
+
+protected:
+	NotifyMethod _receiverMethod;
+
+private:
+	FunctionDelegate();
+};
+
+
+template <class TArgs> 
+class FunctionDelegate<TArgs, true, false>: public AbstractDelegate<TArgs>
+{
+public:
+	typedef void (*NotifyMethod)(void*, TArgs&);
+
+	FunctionDelegate(NotifyMethod method):
+		AbstractDelegate<TArgs>(*reinterpret_cast<void**>(&method)),
+		_receiverMethod(method)
+	{
+	}
+
+	FunctionDelegate(const FunctionDelegate& delegate):
+		AbstractDelegate<TArgs>(delegate),
+		_receiverMethod(delegate._receiverMethod)
+	{
+	}
+
+	~FunctionDelegate()
+	{
+	}
+	
+	FunctionDelegate& operator = (const FunctionDelegate& delegate)
+	{
+		if (&delegate != this)
+		{
+			this->_pTarget        = delegate._pTarget;
+			this->_receiverMethod = delegate._receiverMethod;
+		}
+		return *this;
+	}
+
+	bool notify(const void* sender, TArgs& arguments)
+	{
+		(*_receiverMethod)(const_cast<void*>(sender), arguments);
+		return true; // a "standard" delegate never expires
+	}
+
+	AbstractDelegate<TArgs>* clone() const
+	{
+		return new FunctionDelegate(*this);
+	}
+
+protected:
+	NotifyMethod _receiverMethod;
+
+private:
+	FunctionDelegate();
+};
+
+
+template <class TArgs, bool senderIsConst> 
+class FunctionDelegate<TArgs, false, senderIsConst>: public AbstractDelegate<TArgs>
+{
+public:
+	typedef void (*NotifyMethod)(TArgs&);
+
+	FunctionDelegate(NotifyMethod method):
+		AbstractDelegate<TArgs>(*reinterpret_cast<void**>(&method)),
+		_receiverMethod(method)
+	{
+	}
+
+	FunctionDelegate(const FunctionDelegate& delegate):
+		AbstractDelegate<TArgs>(delegate),
+		_receiverMethod(delegate._receiverMethod)
+	{
+	}
+
+	~FunctionDelegate()
+	{
+	}
+	
+	FunctionDelegate& operator = (const FunctionDelegate& delegate)
+	{
+		if (&delegate != this)
+		{
+			this->_pTarget        = delegate._pTarget;
+			this->_receiverMethod = delegate._receiverMethod;
+		}
+		return *this;
+	}
+
+	bool notify(const void* sender, TArgs& arguments)
+	{
+		(*_receiverMethod)(arguments);
+		return true; // a "standard" delegate never expires
+	}
+
+	AbstractDelegate<TArgs>* clone() const
+	{
+		return new FunctionDelegate(*this);
+	}
+
+protected:
+	NotifyMethod _receiverMethod;
+
+private:
+	FunctionDelegate();
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/FunctionPriorityDelegate.h b/Foundation/include/Poco/FunctionPriorityDelegate.h
index 248ea05f3..f567193d9 100644
--- a/Foundation/include/Poco/FunctionPriorityDelegate.h
+++ b/Foundation/include/Poco/FunctionPriorityDelegate.h
@@ -1,212 +1,212 @@
-//
-// FunctionPriorityDelegate.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/FunctionPriorityDelegate.h#2 $
-//
-// Library: Foundation
-// Package: Events
-// Module:  FunctionPriorityDelegate
-//
-// Implementation of the FunctionPriorityDelegate template.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_FunctionPriorityDelegate_INCLUDED
-#define  Foundation_FunctionPriorityDelegate_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/AbstractPriorityDelegate.h"
-
-
-namespace Poco {
-
-
-template <class TArgs, bool useSender = true, bool senderIsConst = true> 
-class FunctionPriorityDelegate: public AbstractPriorityDelegate<TArgs>
-	/// Wraps a C style function (or a C++ static fucntion) to be used as
-	/// a priority delegate
-{
-public:
-	typedef void (*NotifyMethod)(const void*, TArgs&);
-
-	FunctionPriorityDelegate(NotifyMethod method, int prio):
-		AbstractPriorityDelegate<TArgs>(*reinterpret_cast<void**>(&method), prio),
-		_receiverMethod(method)
-	{
-	}
-	
-	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
-		AbstractPriorityDelegate<TArgs>(delegate._pTarget, delegate._priority),
-		_receiverMethod(delegate._receiverMethod)
-	{
-	}
-	
-	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
-	{
-		if (&delegate != this)
-		{
-			this->_pTarget        = delegate._pTarget;
-			this->_receiverMethod = delegate._receiverMethod;
-			this->_priority       = delegate._priority;
-		}
-		return *this;
-	}
-
-	~FunctionPriorityDelegate()
-	{
-	}
-
-	bool notify(const void* sender, TArgs& arguments)
-	{
-		(*_receiverMethod)(sender, arguments);
-		return true; // per default the delegate never expires
-	}
-
-	AbstractPriorityDelegate<TArgs>* clone() const
-	{
-		return new FunctionPriorityDelegate(*this);
-	}
-
-protected:
-	NotifyMethod _receiverMethod;
-
-private:
-	FunctionPriorityDelegate();
-};
-
-
-template <class TArgs> 
-class FunctionPriorityDelegate<TArgs, true, false>: public AbstractPriorityDelegate<TArgs>
-{
-public:
-	typedef void (*NotifyMethod)(void*, TArgs&);
-
-	FunctionPriorityDelegate(NotifyMethod method, int prio):
-		AbstractPriorityDelegate<TArgs>(*reinterpret_cast<void**>(&method), prio),
-		_receiverMethod(method)
-	{
-	}
-	
-	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
-		AbstractPriorityDelegate<TArgs>(delegate._pTarget, delegate._priority),
-		_receiverMethod(delegate._receiverMethod)
-	{
-	}
-	
-	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
-	{
-		if (&delegate != this)
-		{
-			this->_pTarget        = delegate._pTarget;
-			this->_receiverMethod = delegate._receiverMethod;
-			this->_priority       = delegate._priority;
-		}
-		return *this;
-	}
-
-	~FunctionPriorityDelegate()
-	{
-	}
-
-	bool notify(const void* sender, TArgs& arguments)
-	{
-		(*_receiverMethod)(const_cast<void*>(sender), arguments);
-		return true; // per default the delegate never expires
-	}
-
-	AbstractPriorityDelegate<TArgs>* clone() const
-	{
-		return new FunctionPriorityDelegate(*this);
-	}
-
-protected:
-	NotifyMethod _receiverMethod;
-
-private:
-	FunctionPriorityDelegate();
-};
-
-
-
-template <class TArgs> 
-class FunctionPriorityDelegate<TArgs, false>: public AbstractPriorityDelegate<TArgs>
-{
-public:
-	typedef void (*NotifyMethod)(TArgs&);
-
-	FunctionPriorityDelegate(NotifyMethod method, int prio):
-		AbstractPriorityDelegate<TArgs>(*reinterpret_cast<void**>(&method), prio),
-		_receiverMethod(method)
-	{
-	}
-	
-	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
-		AbstractPriorityDelegate<TArgs>(delegate._pTarget, delegate._priority),
-		_receiverMethod(delegate._receiverMethod)
-	{
-	}
-	
-	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
-	{
-		if (&delegate != this)
-		{
-			this->_pTarget        = delegate._pTarget;
-			this->_receiverMethod = delegate._receiverMethod;
-			this->_priority       = delegate._priority;
-		}
-		return *this;
-	}
-
-	~FunctionPriorityDelegate()
-	{
-	}
-
-	bool notify(const void* sender, TArgs& arguments)
-	{
-		(*_receiverMethod)(arguments);
-		return true; // per default the delegate never expires
-	}
-
-	AbstractPriorityDelegate<TArgs>* clone() const
-	{
-		return new FunctionPriorityDelegate(*this);
-	}
-
-protected:
-	NotifyMethod _receiverMethod;
-
-private:
-	FunctionPriorityDelegate();
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// FunctionPriorityDelegate.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/FunctionPriorityDelegate.h#2 $
+//
+// Library: Foundation
+// Package: Events
+// Module:  FunctionPriorityDelegate
+//
+// Implementation of the FunctionPriorityDelegate template.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_FunctionPriorityDelegate_INCLUDED
+#define  Foundation_FunctionPriorityDelegate_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/AbstractPriorityDelegate.h"
+
+
+namespace Poco {
+
+
+template <class TArgs, bool useSender = true, bool senderIsConst = true> 
+class FunctionPriorityDelegate: public AbstractPriorityDelegate<TArgs>
+	/// Wraps a C style function (or a C++ static fucntion) to be used as
+	/// a priority delegate
+{
+public:
+	typedef void (*NotifyMethod)(const void*, TArgs&);
+
+	FunctionPriorityDelegate(NotifyMethod method, int prio):
+		AbstractPriorityDelegate<TArgs>(*reinterpret_cast<void**>(&method), prio),
+		_receiverMethod(method)
+	{
+	}
+	
+	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
+		AbstractPriorityDelegate<TArgs>(delegate._pTarget, delegate._priority),
+		_receiverMethod(delegate._receiverMethod)
+	{
+	}
+	
+	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
+	{
+		if (&delegate != this)
+		{
+			this->_pTarget        = delegate._pTarget;
+			this->_receiverMethod = delegate._receiverMethod;
+			this->_priority       = delegate._priority;
+		}
+		return *this;
+	}
+
+	~FunctionPriorityDelegate()
+	{
+	}
+
+	bool notify(const void* sender, TArgs& arguments)
+	{
+		(*_receiverMethod)(sender, arguments);
+		return true; // per default the delegate never expires
+	}
+
+	AbstractPriorityDelegate<TArgs>* clone() const
+	{
+		return new FunctionPriorityDelegate(*this);
+	}
+
+protected:
+	NotifyMethod _receiverMethod;
+
+private:
+	FunctionPriorityDelegate();
+};
+
+
+template <class TArgs> 
+class FunctionPriorityDelegate<TArgs, true, false>: public AbstractPriorityDelegate<TArgs>
+{
+public:
+	typedef void (*NotifyMethod)(void*, TArgs&);
+
+	FunctionPriorityDelegate(NotifyMethod method, int prio):
+		AbstractPriorityDelegate<TArgs>(*reinterpret_cast<void**>(&method), prio),
+		_receiverMethod(method)
+	{
+	}
+	
+	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
+		AbstractPriorityDelegate<TArgs>(delegate._pTarget, delegate._priority),
+		_receiverMethod(delegate._receiverMethod)
+	{
+	}
+	
+	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
+	{
+		if (&delegate != this)
+		{
+			this->_pTarget        = delegate._pTarget;
+			this->_receiverMethod = delegate._receiverMethod;
+			this->_priority       = delegate._priority;
+		}
+		return *this;
+	}
+
+	~FunctionPriorityDelegate()
+	{
+	}
+
+	bool notify(const void* sender, TArgs& arguments)
+	{
+		(*_receiverMethod)(const_cast<void*>(sender), arguments);
+		return true; // per default the delegate never expires
+	}
+
+	AbstractPriorityDelegate<TArgs>* clone() const
+	{
+		return new FunctionPriorityDelegate(*this);
+	}
+
+protected:
+	NotifyMethod _receiverMethod;
+
+private:
+	FunctionPriorityDelegate();
+};
+
+
+
+template <class TArgs> 
+class FunctionPriorityDelegate<TArgs, false>: public AbstractPriorityDelegate<TArgs>
+{
+public:
+	typedef void (*NotifyMethod)(TArgs&);
+
+	FunctionPriorityDelegate(NotifyMethod method, int prio):
+		AbstractPriorityDelegate<TArgs>(*reinterpret_cast<void**>(&method), prio),
+		_receiverMethod(method)
+	{
+	}
+	
+	FunctionPriorityDelegate(const FunctionPriorityDelegate& delegate):
+		AbstractPriorityDelegate<TArgs>(delegate._pTarget, delegate._priority),
+		_receiverMethod(delegate._receiverMethod)
+	{
+	}
+	
+	FunctionPriorityDelegate& operator = (const FunctionPriorityDelegate& delegate)
+	{
+		if (&delegate != this)
+		{
+			this->_pTarget        = delegate._pTarget;
+			this->_receiverMethod = delegate._receiverMethod;
+			this->_priority       = delegate._priority;
+		}
+		return *this;
+	}
+
+	~FunctionPriorityDelegate()
+	{
+	}
+
+	bool notify(const void* sender, TArgs& arguments)
+	{
+		(*_receiverMethod)(arguments);
+		return true; // per default the delegate never expires
+	}
+
+	AbstractPriorityDelegate<TArgs>* clone() const
+	{
+		return new FunctionPriorityDelegate(*this);
+	}
+
+protected:
+	NotifyMethod _receiverMethod;
+
+private:
+	FunctionPriorityDelegate();
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/Hash.h b/Foundation/include/Poco/Hash.h
index 0f59f8849..099946c10 100644
--- a/Foundation/include/Poco/Hash.h
+++ b/Foundation/include/Poco/Hash.h
@@ -1,127 +1,127 @@
-//
-// Hash.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/Hash.h#2 $
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  Hash
-//
-// Definition of the Hash class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_Hash_INCLUDED
-#define Foundation_Hash_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include <cstddef>
-
-
-namespace Poco {
-
-
-template <class T>
-struct Hash
-	/// A generic hash function.
-{
-	std::size_t operator () (T value) const
-		/// Returns the hash for the given value.
-	{
-		return hash(value);
-	}
-};
-
-
-std::size_t Foundation_API hash(Int8 n);
-std::size_t Foundation_API hash(UInt8 n);
-std::size_t Foundation_API hash(Int16 n);
-std::size_t Foundation_API hash(UInt16 n);
-std::size_t Foundation_API hash(Int32 n);
-std::size_t Foundation_API hash(UInt32 n);
-std::size_t Foundation_API hash(Int64 n);
-std::size_t Foundation_API hash(UInt64 n);
-std::size_t Foundation_API hash(const std::string& str);
-
-
-//
-// inlines
-//
-inline std::size_t hash(Int8 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(UInt8 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(Int16 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(UInt16 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(Int32 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(UInt32 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(Int64 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-inline std::size_t hash(UInt64 n)
-{
-	return static_cast<std::size_t>(n)*2654435761U; 
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Hash_INCLUDED
+//
+// Hash.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/Hash.h#2 $
+//
+// Library: Foundation
+// Package: Hashing
+// Module:  Hash
+//
+// Definition of the Hash class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_Hash_INCLUDED
+#define Foundation_Hash_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include <cstddef>
+
+
+namespace Poco {
+
+
+template <class T>
+struct Hash
+	/// A generic hash function.
+{
+	std::size_t operator () (T value) const
+		/// Returns the hash for the given value.
+	{
+		return hash(value);
+	}
+};
+
+
+std::size_t Foundation_API hash(Int8 n);
+std::size_t Foundation_API hash(UInt8 n);
+std::size_t Foundation_API hash(Int16 n);
+std::size_t Foundation_API hash(UInt16 n);
+std::size_t Foundation_API hash(Int32 n);
+std::size_t Foundation_API hash(UInt32 n);
+std::size_t Foundation_API hash(Int64 n);
+std::size_t Foundation_API hash(UInt64 n);
+std::size_t Foundation_API hash(const std::string& str);
+
+
+//
+// inlines
+//
+inline std::size_t hash(Int8 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(UInt8 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(Int16 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(UInt16 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(Int32 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(UInt32 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(Int64 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+inline std::size_t hash(UInt64 n)
+{
+	return static_cast<std::size_t>(n)*2654435761U; 
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_Hash_INCLUDED
diff --git a/Foundation/include/Poco/HashMap.h b/Foundation/include/Poco/HashMap.h
index 124a0b094..d72669038 100644
--- a/Foundation/include/Poco/HashMap.h
+++ b/Foundation/include/Poco/HashMap.h
@@ -1,244 +1,244 @@
-//
-// HashMap.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/HashMap.h#2 $
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  HashMap
-//
-// Definition of the HashMap class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_HashMap_INCLUDED
-#define Foundation_HashMap_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/LinearHashTable.h"
-#include "Poco/Exception.h"
-#include <utility>
-
-
-namespace Poco {
-
-
-template <class Key, class Value>
-struct HashMapEntry
-	/// This class template is used internally by HashMap.
-{
-	Key   first;
-	Value second;
-	
-	HashMapEntry():
-		first(),
-		second()
-	{
-	}
-	
-	HashMapEntry(const Key& key):
-		first(key),
-		second()
-	{
-	}
-
-	HashMapEntry(const Key& key, const Value& value):
-		first(key),
-		second(value)
-	{
-	}
-	
-	bool operator == (const HashMapEntry& entry) const
-	{
-		return first == entry.first;
-	}
-
-	bool operator != (const HashMapEntry& entry) const
-	{
-		return first != entry.first;
-	}
-};
-
-
-template <class HME, class KeyHashFunc>
-struct HashMapEntryHash
-	/// This class template is used internally by HashMap.
-{
-	std::size_t operator () (const HME& entry) const
-	{
-		return _func(entry.first);
-	}
-
-private:
-	KeyHashFunc _func;
-};
-
-
-template <class Key, class Mapped, class HashFunc = Hash<Key> >
-class HashMap
-	/// This class implements a map using a LinearHashTable.
-	///
-	/// A HashMap can be used just like a std::map.
-{
-public:
-	typedef Key                 KeyType;
-	typedef Mapped              MappedType;
-	typedef Mapped&             Reference;
-	typedef const Mapped&       ConstReference;
-	typedef Mapped*             Pointer;
-	typedef const Mapped*       ConstPointer;
-	
-	typedef HashMapEntry<Key, Mapped>      ValueType;
-	typedef std::pair<KeyType, MappedType> PairType;
-	
-	typedef HashMapEntryHash<ValueType, HashFunc> HashType;
-	typedef LinearHashTable<ValueType, HashType>  HashTable;
-	
-	typedef typename HashTable::Iterator      Iterator;
-	typedef typename HashTable::ConstIterator ConstIterator;
-	
-	HashMap()
-		/// Creates an empty HashMap.
-	{
-	}
-	
-	HashMap(std::size_t initialReserve):
-		_table(initialReserve)
-		/// Creates the HashMap with room for initialReserve entries.
-	{
-	}
-	
-	HashMap& operator = (const HashMap& map)
-		/// Assigns another HashMap.
-	{
-		HashMap tmp(map);
-		swap(tmp);
-		return *this;
-	}
-	
-	void swap(HashMap& map)
-		/// Swaps the HashMap with another one.
-	{
-		_table.swap(map._table);
-	}
-	
-	ConstIterator begin() const
-	{
-		return _table.begin();
-	}
-	
-	ConstIterator end() const
-	{
-		return _table.end();
-	}
-	
-	Iterator begin()
-	{
-		return _table.begin();
-	}
-	
-	Iterator end()
-	{
-		return _table.end();
-	}
-	
-	ConstIterator find(const KeyType& key) const
-	{
-		ValueType value(key);
-		return _table.find(value);
-	}
-
-	Iterator find(const KeyType& key)
-	{
-		ValueType value(key);
-		return _table.find(value);
-	}
-
-	std::pair<Iterator, bool> insert(const PairType& pair)
-	{
-		ValueType value(pair.first, pair.second);
-		return _table.insert(value);
-	}
-
-	std::pair<Iterator, bool> insert(const ValueType& value)
-	{
-		return _table.insert(value);
-	}
-	
-	void erase(Iterator it)
-	{
-		_table.erase(it);
-	}
-	
-	void erase(const KeyType& key)
-	{
-		Iterator it = find(key);
-		_table.erase(it);
-	}
-	
-	void clear()
-	{
-		_table.clear();
-	}
-
-	std::size_t size() const
-	{
-		return _table.size();
-	}
-
-	bool empty() const
-	{
-		return _table.empty();
-	}
-
-	ConstReference operator [] (const KeyType& key) const
-	{
-		ConstIterator it = _table.find(key);
-		if (it != _table.end())
-			return it->second;
-		else
-			throw NotFoundException();
-	}
-
-	Reference operator [] (const KeyType& key)
-	{
-		ValueType value(key);
-		std::pair<Iterator, bool> res = _table.insert(value);
-		return res.first->second;
-	}
-
-private:
-	HashTable _table;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_HashMap_INCLUDED
+//
+// HashMap.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/HashMap.h#2 $
+//
+// Library: Foundation
+// Package: Hashing
+// Module:  HashMap
+//
+// Definition of the HashMap class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_HashMap_INCLUDED
+#define Foundation_HashMap_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/LinearHashTable.h"
+#include "Poco/Exception.h"
+#include <utility>
+
+
+namespace Poco {
+
+
+template <class Key, class Value>
+struct HashMapEntry
+	/// This class template is used internally by HashMap.
+{
+	Key   first;
+	Value second;
+	
+	HashMapEntry():
+		first(),
+		second()
+	{
+	}
+	
+	HashMapEntry(const Key& key):
+		first(key),
+		second()
+	{
+	}
+
+	HashMapEntry(const Key& key, const Value& value):
+		first(key),
+		second(value)
+	{
+	}
+	
+	bool operator == (const HashMapEntry& entry) const
+	{
+		return first == entry.first;
+	}
+
+	bool operator != (const HashMapEntry& entry) const
+	{
+		return first != entry.first;
+	}
+};
+
+
+template <class HME, class KeyHashFunc>
+struct HashMapEntryHash
+	/// This class template is used internally by HashMap.
+{
+	std::size_t operator () (const HME& entry) const
+	{
+		return _func(entry.first);
+	}
+
+private:
+	KeyHashFunc _func;
+};
+
+
+template <class Key, class Mapped, class HashFunc = Hash<Key> >
+class HashMap
+	/// This class implements a map using a LinearHashTable.
+	///
+	/// A HashMap can be used just like a std::map.
+{
+public:
+	typedef Key                 KeyType;
+	typedef Mapped              MappedType;
+	typedef Mapped&             Reference;
+	typedef const Mapped&       ConstReference;
+	typedef Mapped*             Pointer;
+	typedef const Mapped*       ConstPointer;
+	
+	typedef HashMapEntry<Key, Mapped>      ValueType;
+	typedef std::pair<KeyType, MappedType> PairType;
+	
+	typedef HashMapEntryHash<ValueType, HashFunc> HashType;
+	typedef LinearHashTable<ValueType, HashType>  HashTable;
+	
+	typedef typename HashTable::Iterator      Iterator;
+	typedef typename HashTable::ConstIterator ConstIterator;
+	
+	HashMap()
+		/// Creates an empty HashMap.
+	{
+	}
+	
+	HashMap(std::size_t initialReserve):
+		_table(initialReserve)
+		/// Creates the HashMap with room for initialReserve entries.
+	{
+	}
+	
+	HashMap& operator = (const HashMap& map)
+		/// Assigns another HashMap.
+	{
+		HashMap tmp(map);
+		swap(tmp);
+		return *this;
+	}
+	
+	void swap(HashMap& map)
+		/// Swaps the HashMap with another one.
+	{
+		_table.swap(map._table);
+	}
+	
+	ConstIterator begin() const
+	{
+		return _table.begin();
+	}
+	
+	ConstIterator end() const
+	{
+		return _table.end();
+	}
+	
+	Iterator begin()
+	{
+		return _table.begin();
+	}
+	
+	Iterator end()
+	{
+		return _table.end();
+	}
+	
+	ConstIterator find(const KeyType& key) const
+	{
+		ValueType value(key);
+		return _table.find(value);
+	}
+
+	Iterator find(const KeyType& key)
+	{
+		ValueType value(key);
+		return _table.find(value);
+	}
+
+	std::pair<Iterator, bool> insert(const PairType& pair)
+	{
+		ValueType value(pair.first, pair.second);
+		return _table.insert(value);
+	}
+
+	std::pair<Iterator, bool> insert(const ValueType& value)
+	{
+		return _table.insert(value);
+	}
+	
+	void erase(Iterator it)
+	{
+		_table.erase(it);
+	}
+	
+	void erase(const KeyType& key)
+	{
+		Iterator it = find(key);
+		_table.erase(it);
+	}
+	
+	void clear()
+	{
+		_table.clear();
+	}
+
+	std::size_t size() const
+	{
+		return _table.size();
+	}
+
+	bool empty() const
+	{
+		return _table.empty();
+	}
+
+	ConstReference operator [] (const KeyType& key) const
+	{
+		ConstIterator it = _table.find(key);
+		if (it != _table.end())
+			return it->second;
+		else
+			throw NotFoundException();
+	}
+
+	Reference operator [] (const KeyType& key)
+	{
+		ValueType value(key);
+		std::pair<Iterator, bool> res = _table.insert(value);
+		return res.first->second;
+	}
+
+private:
+	HashTable _table;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_HashMap_INCLUDED
diff --git a/Foundation/include/Poco/HashSet.h b/Foundation/include/Poco/HashSet.h
index 5c627e7ea..d77f18523 100644
--- a/Foundation/include/Poco/HashSet.h
+++ b/Foundation/include/Poco/HashSet.h
@@ -1,199 +1,199 @@
-//
-// HashSet.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/HashSet.h#2 $
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  HashSet
-//
-// Definition of the HashSet class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_HashSet_INCLUDED
-#define Foundation_HashSet_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/LinearHashTable.h"
-
-
-namespace Poco {
-
-
-template <class Value, class HashFunc = Hash<Value> >
-class HashSet
-	/// This class implements a set using a LinearHashTable.
-	///
-	/// A HashSet can be used just like a std::set.
-{
-public:
-	typedef Value        ValueType;
-	typedef Value&       Reference;
-	typedef const Value& ConstReference;
-	typedef Value*       Pointer;
-	typedef const Value* ConstPointer;
-	typedef HashFunc     Hash;
-	
-	typedef LinearHashTable<ValueType, Hash> HashTable;
-	
-	typedef typename HashTable::Iterator      Iterator;
-	typedef typename HashTable::ConstIterator ConstIterator;
-
-	HashSet()
-		/// Creates an empty HashSet.
-	{
-	}
-
-	HashSet(std::size_t initialReserve): 
-		_table(initialReserve)
-		/// Creates the HashSet, using the given initialReserve.
-	{
-	}
-	
-	HashSet(const HashSet& set):
-		_table(set._table)
-		/// Creates the HashSet by copying another one.
-	{
-	}
-	
-	~HashSet()
-		/// Destroys the HashSet.
-	{
-	}
-	
-	HashSet& operator = (const HashSet& table)
-		/// Assigns another HashSet.
-	{
-		HashSet tmp(table);
-		swap(tmp);
-		return *this;
-	}
-	
-	void swap(HashSet& set)
-		/// Swaps the HashSet with another one.
-	{
-		_table.swap(set._table);
-	}
-	
-	ConstIterator begin() const
-		/// Returns an iterator pointing to the first entry, if one exists.
-	{
-		return _table.begin();
-	}
-	
-	ConstIterator end() const
-		/// Returns an iterator pointing to the end of the table.
-	{
-		return _table.end();
-	}
-	
-	Iterator begin()
-		/// Returns an iterator pointing to the first entry, if one exists.
-	{
-		return _table.begin();
-	}
-	
-	Iterator end()
-		/// Returns an iterator pointing to the end of the table.
-	{
-		return _table.end();
-	}
-		
-	ConstIterator find(const ValueType& value) const
-		/// Finds an entry in the table.
-	{
-		return _table.find(value);
-	}
-
-	Iterator find(const ValueType& value)
-		/// Finds an entry in the table.
-	{
-		return _table.find(value);
-	}
-	
-	std::size_t count(const ValueType& value) const
-		/// Returns the number of elements with the given
-		/// value, with is either 1 or 0.
-	{
-		return _table.count(value);
-	}
-	
-	std::pair<Iterator, bool> insert(const ValueType& value)
-		/// Inserts an element into the set.
-		///
-		/// If the element already exists in the set,
-		/// a pair(iterator, false) with iterator pointing to the 
-		/// existing element is returned.
-		/// Otherwise, the element is inserted an a 
-		/// pair(iterator, true) with iterator
-		/// pointing to the new element is returned.
-	{
-		return _table.insert(value);
-	}
-	
-	void erase(Iterator it)
-		/// Erases the element pointed to by it.
-	{
-		_table.erase(it);
-	}
-	
-	void erase(const ValueType& value)
-		/// Erases the element with the given value, if it exists.
-	{
-		_table.erase(value);
-	}
-	
-	void clear()
-		/// Erases all elements.
-	{
-		_table.clear();
-	}
-	
-	std::size_t size() const
-		/// Returns the number of elements in the table.
-	{
-		return _table.size();
-	}
-	
-	bool empty() const
-		/// Returns true iff the table is empty.
-	{
-		return _table.empty();
-	}
-
-private:
-	HashTable _table;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_HashSet_INCLUDED
+//
+// HashSet.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/HashSet.h#2 $
+//
+// Library: Foundation
+// Package: Hashing
+// Module:  HashSet
+//
+// Definition of the HashSet class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_HashSet_INCLUDED
+#define Foundation_HashSet_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/LinearHashTable.h"
+
+
+namespace Poco {
+
+
+template <class Value, class HashFunc = Hash<Value> >
+class HashSet
+	/// This class implements a set using a LinearHashTable.
+	///
+	/// A HashSet can be used just like a std::set.
+{
+public:
+	typedef Value        ValueType;
+	typedef Value&       Reference;
+	typedef const Value& ConstReference;
+	typedef Value*       Pointer;
+	typedef const Value* ConstPointer;
+	typedef HashFunc     Hash;
+	
+	typedef LinearHashTable<ValueType, Hash> HashTable;
+	
+	typedef typename HashTable::Iterator      Iterator;
+	typedef typename HashTable::ConstIterator ConstIterator;
+
+	HashSet()
+		/// Creates an empty HashSet.
+	{
+	}
+
+	HashSet(std::size_t initialReserve): 
+		_table(initialReserve)
+		/// Creates the HashSet, using the given initialReserve.
+	{
+	}
+	
+	HashSet(const HashSet& set):
+		_table(set._table)
+		/// Creates the HashSet by copying another one.
+	{
+	}
+	
+	~HashSet()
+		/// Destroys the HashSet.
+	{
+	}
+	
+	HashSet& operator = (const HashSet& table)
+		/// Assigns another HashSet.
+	{
+		HashSet tmp(table);
+		swap(tmp);
+		return *this;
+	}
+	
+	void swap(HashSet& set)
+		/// Swaps the HashSet with another one.
+	{
+		_table.swap(set._table);
+	}
+	
+	ConstIterator begin() const
+		/// Returns an iterator pointing to the first entry, if one exists.
+	{
+		return _table.begin();
+	}
+	
+	ConstIterator end() const
+		/// Returns an iterator pointing to the end of the table.
+	{
+		return _table.end();
+	}
+	
+	Iterator begin()
+		/// Returns an iterator pointing to the first entry, if one exists.
+	{
+		return _table.begin();
+	}
+	
+	Iterator end()
+		/// Returns an iterator pointing to the end of the table.
+	{
+		return _table.end();
+	}
+		
+	ConstIterator find(const ValueType& value) const
+		/// Finds an entry in the table.
+	{
+		return _table.find(value);
+	}
+
+	Iterator find(const ValueType& value)
+		/// Finds an entry in the table.
+	{
+		return _table.find(value);
+	}
+	
+	std::size_t count(const ValueType& value) const
+		/// Returns the number of elements with the given
+		/// value, with is either 1 or 0.
+	{
+		return _table.count(value);
+	}
+	
+	std::pair<Iterator, bool> insert(const ValueType& value)
+		/// Inserts an element into the set.
+		///
+		/// If the element already exists in the set,
+		/// a pair(iterator, false) with iterator pointing to the 
+		/// existing element is returned.
+		/// Otherwise, the element is inserted an a 
+		/// pair(iterator, true) with iterator
+		/// pointing to the new element is returned.
+	{
+		return _table.insert(value);
+	}
+	
+	void erase(Iterator it)
+		/// Erases the element pointed to by it.
+	{
+		_table.erase(it);
+	}
+	
+	void erase(const ValueType& value)
+		/// Erases the element with the given value, if it exists.
+	{
+		_table.erase(value);
+	}
+	
+	void clear()
+		/// Erases all elements.
+	{
+		_table.clear();
+	}
+	
+	std::size_t size() const
+		/// Returns the number of elements in the table.
+	{
+		return _table.size();
+	}
+	
+	bool empty() const
+		/// Returns true iff the table is empty.
+	{
+		return _table.empty();
+	}
+
+private:
+	HashTable _table;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_HashSet_INCLUDED
diff --git a/Foundation/include/Poco/LinearHashTable.h b/Foundation/include/Poco/LinearHashTable.h
index fa66b5908..859933401 100644
--- a/Foundation/include/Poco/LinearHashTable.h
+++ b/Foundation/include/Poco/LinearHashTable.h
@@ -1,492 +1,492 @@
-//
-// LinearHashTable.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/LinearHashTable.h#2 $
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  LinearHashTable
-//
-// Definition of the LinearHashTable class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_LinearHashTable_INCLUDED
-#define Foundation_LinearHashTable_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/Hash.h"
-#include <functional>
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <cstddef>
-
-
-namespace Poco {
-
-
-template <class Value, class HashFunc = Hash<Value> >
-class LinearHashTable
-	/// This class implements a linear hash table.
-	///
-	/// In a linear hash table, the available address space
-	/// grows or shrinks dynamically. A linar hash table thus
-	/// supports any number of insertions or deletions without
-	/// lookup or insertion performance deterioration.
-	///
-	/// Linear hashing was discovered by Witold Litwin in 1980
-	/// and described in the paper LINEAR HASHING: A NEW TOOL FOR FILE AND TABLE ADDRESSING.
-	///
-	/// For more information on linear hashing, see <http://en.wikipedia.org/wiki/Linear_hash>.
-	///
-	/// The LinearHashTable is not thread safe.
-	///
-	/// Value must support comparison for equality.
-	///
-	/// Find, insert and delete operations are basically O(1) with regard
-	/// to the total number of elements in the table, and O(N) with regard
-	/// to the number of elements in the bucket where the element is stored.
-	/// On average, every bucket stores one element; the exact number depends
-	/// on the quality of the hash function. In most cases, the maximum number of
-	/// elements in a bucket should not exceed 3.
-{
-public:
-	typedef Value               ValueType;
-	typedef Value&              Reference;
-	typedef const Value&        ConstReference;
-	typedef Value*              Pointer;
-	typedef const Value*        ConstPointer;
-	typedef HashFunc            Hash;
-	typedef std::vector<Value>  Bucket;
-	typedef std::vector<Bucket> BucketVec;
-	typedef typename Bucket::iterator    BucketIterator;
-	typedef typename BucketVec::iterator BucketVecIterator;
-
-	class ConstIterator
-	{
-	public:
-		ConstIterator()
-		{
-		}
-		
-		ConstIterator(const BucketVecIterator& vecIt, const BucketVecIterator& endIt, const BucketIterator& buckIt):
-			_vecIt(vecIt),
-			_endIt(endIt),
-			_buckIt(buckIt)
-		{
-		}
-
-		ConstIterator(const ConstIterator& it):
-			_vecIt(it._vecIt),
-			_endIt(it._endIt),
-			_buckIt(it._buckIt)
-		{
-		}
-		
-		ConstIterator& operator = (const ConstIterator& it)
-		{
-			ConstIterator tmp(it);
-			swap(tmp);
-			return *this;
-		}
-		
-		void swap(ConstIterator& it)
-		{
-			using std::swap;
-			swap(_vecIt, it._vecIt);
-			swap(_endIt, it._endIt);
-			swap(_buckIt, it._buckIt);
-		}
-		
-		bool operator == (const ConstIterator& it) const
-		{
-			return _vecIt == it._vecIt && (_vecIt == _endIt || _buckIt == it._buckIt);
-		}
-
-		bool operator != (const ConstIterator& it) const
-		{
-			return _vecIt != it._vecIt || (_vecIt != _endIt && _buckIt != it._buckIt);
-		}
-		
-		const typename Bucket::value_type& operator * () const
-		{
-			return *_buckIt;
-		}
-
-		const typename Bucket::value_type* operator -> () const
-		{
-			return &*_buckIt;
-		}
-		
-		ConstIterator& operator ++ () // prefix
-		{
-			if (_vecIt != _endIt)
-			{
-				++_buckIt;
-				while (_vecIt != _endIt && _buckIt == _vecIt->end())
-				{
-					++_vecIt;
-					if (_vecIt != _endIt) _buckIt = _vecIt->begin();
-				}
-			}
-			return *this;
-		}
-		
-		ConstIterator operator ++ (int) // postfix
-		{
-			ConstIterator tmp(*this);
-			++*this;
-			return tmp;
-		}
-		
-	protected:
-		BucketVecIterator _vecIt;
-		BucketVecIterator _endIt;
-		BucketIterator    _buckIt;
-		
-		friend class LinearHashTable;
-	};
-	
-	class Iterator: public ConstIterator
-	{
-	public:
-		Iterator()
-		{
-		}
-		
-		Iterator(const BucketVecIterator& vecIt, const BucketVecIterator& endIt, const BucketIterator& buckIt):
-			ConstIterator(vecIt, endIt, buckIt)
-		{
-		}
-
-		Iterator(const Iterator& it):
-			ConstIterator(it)
-		{
-		}
-		
-		Iterator& operator = (const Iterator& it)
-		{
-			Iterator tmp(it);
-			swap(tmp);
-			return *this;
-		}
-		
-		void swap(Iterator& it)
-		{
-			ConstIterator::swap(it);
-		}
-				
-		typename Bucket::value_type& operator * ()
-		{
-			return *this->_buckIt;
-		}
-
-		const typename Bucket::value_type& operator * () const
-		{
-			return *this->_buckIt;
-		}
-
-		typename Bucket::value_type* operator -> ()
-		{
-			return &*this->_buckIt;
-		}
-
-		const typename Bucket::value_type* operator -> () const
-		{
-			return &*this->_buckIt;
-		}
-		
-		Iterator& operator ++ () // prefix
-		{
-			ConstIterator::operator ++ ();
-			return *this;
-		}
-		
-		Iterator operator ++ (int) // postfix
-		{
-			Iterator tmp(*this);
-			++*this;
-			return tmp;
-		}
-
-		friend class LinearHashTable;
-	};
-	
-	LinearHashTable(std::size_t initialReserve = 64): 
-		_split(0),
-		_front(1),
-		_size(0)
-		/// Creates the LinearHashTable, using the given initialReserve.
-	{
-		_buckets.reserve(calcSize(initialReserve));
-		_buckets.push_back(Bucket());
-	}
-	
-	LinearHashTable(const LinearHashTable& table):
-		_buckets(table._buckets),
-		_split(table._split),
-		_front(table._front),
-		_size(table._size)
-		/// Creates the LinearHashTable by copying another one.
-	{
-	}
-	
-	~LinearHashTable()
-		/// Destroys the LinearHashTable.
-	{
-	}
-	
-	LinearHashTable& operator = (const LinearHashTable& table)
-		/// Assigns another LinearHashTable.
-	{
-		LinearHashTable tmp(table);
-		swap(tmp);
-		return *this;
-	}
-	
-	void swap(LinearHashTable& table)
-		/// Swaps the LinearHashTable with another one.
-	{
-		using std::swap;
-		swap(_buckets, table._buckets);
-		swap(_split, table._split);
-		swap(_front, table._front);
-		swap(_size, table._size);
-	}
-	
-	ConstIterator begin() const
-		/// Returns an iterator pointing to the first entry, if one exists.
-	{
-		BucketVecIterator it(_buckets.begin());
-		BucketVecIterator end(_buckets.end());
-		while (it != end && it->empty())
-		{
-			++it;
-		}
-		if (it == end)
-			return this->end();
-		else
-			return ConstIterator(it, end, it->begin());
-	}
-	
-	ConstIterator end() const
-		/// Returns an iterator pointing to the end of the table.
-	{
-		return ConstIterator(_buckets.end(), _buckets.end(), _buckets.front().end());
-	}
-	
-	Iterator begin()
-		/// Returns an iterator pointing to the first entry, if one exists.
-	{
-		BucketVecIterator it(_buckets.begin());
-		BucketVecIterator end(_buckets.end());
-		while (it != end && it->empty())
-		{
-			++it;
-		}
-		if (it == end)
-			return this->end();
-		else
-			return Iterator(it, end, it->begin());
-	}
-	
-	Iterator end()
-		/// Returns an iterator pointing to the end of the table.
-	{
-		return Iterator(_buckets.end(), _buckets.end(), _buckets.front().end());
-	}
-		
-	ConstIterator find(const Value& value) const
-		/// Finds an entry in the table.
-	{
-		std::size_t addr = bucketAddress(value);
-		BucketVecIterator it(_buckets.begin() + addr);
-		BucketIterator buckIt(std::find(it->begin(), it->end(), value));
-		if (buckIt != it->end())
-			return ConstIterator(it, _buckets.end(), buckIt);
-		else
-			return end();
-	}
-
-	Iterator find(const Value& value)
-		/// Finds an entry in the table.
-	{
-		std::size_t addr = bucketAddress(value);
-		BucketVecIterator it(_buckets.begin() + addr);
-		BucketIterator buckIt(std::find(it->begin(), it->end(), value));
-		if (buckIt != it->end())
-			return Iterator(it, _buckets.end(), buckIt);
-		else
-			return end();
-	}
-	
-	std::size_t count(const Value& value) const
-		/// Returns the number of elements with the given
-		/// value, with is either 1 or 0.
-	{
-		return find(value) != end() ? 1 : 0;
-	}
-	
-	std::pair<Iterator, bool> insert(const Value& value)
-		/// Inserts an element into the table.
-		///
-		/// If the element already exists in the table,
-		/// a pair(iterator, false) with iterator pointing to the 
-		/// existing element is returned.
-		/// Otherwise, the element is inserted an a 
-		/// pair(iterator, true) with iterator
-		/// pointing to the new element is returned.
-	{
-		split();
-		std::size_t addr = bucketAddress(value);
-		BucketVecIterator it(_buckets.begin() + addr);
-		BucketIterator buckIt(std::find(it->begin(), it->end(), value));
-		if (buckIt == it->end())
-		{
-			buckIt = it->insert(buckIt, value);
-			++_size;
-			return std::make_pair(Iterator(it, _buckets.end(), buckIt), true);
-		}
-		else
-		{
-			return std::make_pair(Iterator(it, _buckets.end(), buckIt), false);
-		}
-	}
-	
-	void erase(Iterator it)
-		/// Erases the element pointed to by it.
-	{
-		if (it != end())
-		{
-			it._vecIt->erase(it._buckIt);
-			--_size;
-			merge();
-		}
-	}
-	
-	void erase(const Value& value)
-		/// Erases the element with the given value, if it exists.
-	{
-		Iterator it = find(value);
-		erase(it);
-	}
-	
-	void clear()
-		/// Erases all elements.
-	{
-		LinearHashTable empty;
-		swap(empty);
-	}
-	
-	std::size_t size() const
-		/// Returns the number of elements in the table.
-	{
-		return _size;
-	}
-	
-	bool empty() const
-		/// Returns true iff the table is empty.
-	{
-		return _size == 0;
-	}
-	
-protected:
-	std::size_t bucketAddress(const Value& value) const
-	{
-		std::size_t n = _hash(value);
-		if (n % _front >= _split)
-			return n % _front;
-		else
-			return n % (2*_front);
-	}
-	
-	void split()
-	{
-		if (_split == _front)
-		{
-			_split = 0;
-			_front *= 2;
-			_buckets.reserve(_front*2);
-		}
-		Bucket tmp;
-		_buckets.push_back(tmp);
-		_buckets[_split].swap(tmp);
-		++_split;
-		for (BucketIterator it = tmp.begin(); it != tmp.end(); ++it)
-		{
-			using std::swap;
-			std::size_t addr = bucketAddress(*it);
-			_buckets[addr].push_back(Value());
-			swap(*it, _buckets[addr].back());
-		}
-	}
-	
-	void merge()
-	{
-		if (_split == 0)
-		{
-			_front /= 2;
-			_split = _front;
-		}
-		--_split;
-		Bucket tmp;
-		tmp.swap(_buckets.back());
-		_buckets.pop_back();
-		for (BucketIterator it = tmp.begin(); it != tmp.end(); ++it)
-		{
-			using std::swap;
-			std::size_t addr = bucketAddress(*it);
-			_buckets[addr].push_back(Value());
-			swap(*it, _buckets[addr].back());
-		}
-	}
-	
-	static std::size_t calcSize(std::size_t initialSize)
-	{
-		std::size_t size = 32;
-		while (size < initialSize) size *= 2;
-		return size;
-	}
-	
-private:
-	// Evil hack: _buckets must be mutable because both ConstIterator and Iterator hold 
-	// ordinary iterator's (not const_iterator's).
-	mutable BucketVec _buckets;
-	std::size_t _split;
-	std::size_t _front;
-	std::size_t _size;
-	HashFunc    _hash;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_LinearHashTable_INCLUDED
+//
+// LinearHashTable.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/LinearHashTable.h#2 $
+//
+// Library: Foundation
+// Package: Hashing
+// Module:  LinearHashTable
+//
+// Definition of the LinearHashTable class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_LinearHashTable_INCLUDED
+#define Foundation_LinearHashTable_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/Hash.h"
+#include <functional>
+#include <algorithm>
+#include <vector>
+#include <utility>
+#include <cstddef>
+
+
+namespace Poco {
+
+
+template <class Value, class HashFunc = Hash<Value> >
+class LinearHashTable
+	/// This class implements a linear hash table.
+	///
+	/// In a linear hash table, the available address space
+	/// grows or shrinks dynamically. A linar hash table thus
+	/// supports any number of insertions or deletions without
+	/// lookup or insertion performance deterioration.
+	///
+	/// Linear hashing was discovered by Witold Litwin in 1980
+	/// and described in the paper LINEAR HASHING: A NEW TOOL FOR FILE AND TABLE ADDRESSING.
+	///
+	/// For more information on linear hashing, see <http://en.wikipedia.org/wiki/Linear_hash>.
+	///
+	/// The LinearHashTable is not thread safe.
+	///
+	/// Value must support comparison for equality.
+	///
+	/// Find, insert and delete operations are basically O(1) with regard
+	/// to the total number of elements in the table, and O(N) with regard
+	/// to the number of elements in the bucket where the element is stored.
+	/// On average, every bucket stores one element; the exact number depends
+	/// on the quality of the hash function. In most cases, the maximum number of
+	/// elements in a bucket should not exceed 3.
+{
+public:
+	typedef Value               ValueType;
+	typedef Value&              Reference;
+	typedef const Value&        ConstReference;
+	typedef Value*              Pointer;
+	typedef const Value*        ConstPointer;
+	typedef HashFunc            Hash;
+	typedef std::vector<Value>  Bucket;
+	typedef std::vector<Bucket> BucketVec;
+	typedef typename Bucket::iterator    BucketIterator;
+	typedef typename BucketVec::iterator BucketVecIterator;
+
+	class ConstIterator
+	{
+	public:
+		ConstIterator()
+		{
+		}
+		
+		ConstIterator(const BucketVecIterator& vecIt, const BucketVecIterator& endIt, const BucketIterator& buckIt):
+			_vecIt(vecIt),
+			_endIt(endIt),
+			_buckIt(buckIt)
+		{
+		}
+
+		ConstIterator(const ConstIterator& it):
+			_vecIt(it._vecIt),
+			_endIt(it._endIt),
+			_buckIt(it._buckIt)
+		{
+		}
+		
+		ConstIterator& operator = (const ConstIterator& it)
+		{
+			ConstIterator tmp(it);
+			swap(tmp);
+			return *this;
+		}
+		
+		void swap(ConstIterator& it)
+		{
+			using std::swap;
+			swap(_vecIt, it._vecIt);
+			swap(_endIt, it._endIt);
+			swap(_buckIt, it._buckIt);
+		}
+		
+		bool operator == (const ConstIterator& it) const
+		{
+			return _vecIt == it._vecIt && (_vecIt == _endIt || _buckIt == it._buckIt);
+		}
+
+		bool operator != (const ConstIterator& it) const
+		{
+			return _vecIt != it._vecIt || (_vecIt != _endIt && _buckIt != it._buckIt);
+		}
+		
+		const typename Bucket::value_type& operator * () const
+		{
+			return *_buckIt;
+		}
+
+		const typename Bucket::value_type* operator -> () const
+		{
+			return &*_buckIt;
+		}
+		
+		ConstIterator& operator ++ () // prefix
+		{
+			if (_vecIt != _endIt)
+			{
+				++_buckIt;
+				while (_vecIt != _endIt && _buckIt == _vecIt->end())
+				{
+					++_vecIt;
+					if (_vecIt != _endIt) _buckIt = _vecIt->begin();
+				}
+			}
+			return *this;
+		}
+		
+		ConstIterator operator ++ (int) // postfix
+		{
+			ConstIterator tmp(*this);
+			++*this;
+			return tmp;
+		}
+		
+	protected:
+		BucketVecIterator _vecIt;
+		BucketVecIterator _endIt;
+		BucketIterator    _buckIt;
+		
+		friend class LinearHashTable;
+	};
+	
+	class Iterator: public ConstIterator
+	{
+	public:
+		Iterator()
+		{
+		}
+		
+		Iterator(const BucketVecIterator& vecIt, const BucketVecIterator& endIt, const BucketIterator& buckIt):
+			ConstIterator(vecIt, endIt, buckIt)
+		{
+		}
+
+		Iterator(const Iterator& it):
+			ConstIterator(it)
+		{
+		}
+		
+		Iterator& operator = (const Iterator& it)
+		{
+			Iterator tmp(it);
+			swap(tmp);
+			return *this;
+		}
+		
+		void swap(Iterator& it)
+		{
+			ConstIterator::swap(it);
+		}
+				
+		typename Bucket::value_type& operator * ()
+		{
+			return *this->_buckIt;
+		}
+
+		const typename Bucket::value_type& operator * () const
+		{
+			return *this->_buckIt;
+		}
+
+		typename Bucket::value_type* operator -> ()
+		{
+			return &*this->_buckIt;
+		}
+
+		const typename Bucket::value_type* operator -> () const
+		{
+			return &*this->_buckIt;
+		}
+		
+		Iterator& operator ++ () // prefix
+		{
+			ConstIterator::operator ++ ();
+			return *this;
+		}
+		
+		Iterator operator ++ (int) // postfix
+		{
+			Iterator tmp(*this);
+			++*this;
+			return tmp;
+		}
+
+		friend class LinearHashTable;
+	};
+	
+	LinearHashTable(std::size_t initialReserve = 64): 
+		_split(0),
+		_front(1),
+		_size(0)
+		/// Creates the LinearHashTable, using the given initialReserve.
+	{
+		_buckets.reserve(calcSize(initialReserve));
+		_buckets.push_back(Bucket());
+	}
+	
+	LinearHashTable(const LinearHashTable& table):
+		_buckets(table._buckets),
+		_split(table._split),
+		_front(table._front),
+		_size(table._size)
+		/// Creates the LinearHashTable by copying another one.
+	{
+	}
+	
+	~LinearHashTable()
+		/// Destroys the LinearHashTable.
+	{
+	}
+	
+	LinearHashTable& operator = (const LinearHashTable& table)
+		/// Assigns another LinearHashTable.
+	{
+		LinearHashTable tmp(table);
+		swap(tmp);
+		return *this;
+	}
+	
+	void swap(LinearHashTable& table)
+		/// Swaps the LinearHashTable with another one.
+	{
+		using std::swap;
+		swap(_buckets, table._buckets);
+		swap(_split, table._split);
+		swap(_front, table._front);
+		swap(_size, table._size);
+	}
+	
+	ConstIterator begin() const
+		/// Returns an iterator pointing to the first entry, if one exists.
+	{
+		BucketVecIterator it(_buckets.begin());
+		BucketVecIterator end(_buckets.end());
+		while (it != end && it->empty())
+		{
+			++it;
+		}
+		if (it == end)
+			return this->end();
+		else
+			return ConstIterator(it, end, it->begin());
+	}
+	
+	ConstIterator end() const
+		/// Returns an iterator pointing to the end of the table.
+	{
+		return ConstIterator(_buckets.end(), _buckets.end(), _buckets.front().end());
+	}
+	
+	Iterator begin()
+		/// Returns an iterator pointing to the first entry, if one exists.
+	{
+		BucketVecIterator it(_buckets.begin());
+		BucketVecIterator end(_buckets.end());
+		while (it != end && it->empty())
+		{
+			++it;
+		}
+		if (it == end)
+			return this->end();
+		else
+			return Iterator(it, end, it->begin());
+	}
+	
+	Iterator end()
+		/// Returns an iterator pointing to the end of the table.
+	{
+		return Iterator(_buckets.end(), _buckets.end(), _buckets.front().end());
+	}
+		
+	ConstIterator find(const Value& value) const
+		/// Finds an entry in the table.
+	{
+		std::size_t addr = bucketAddress(value);
+		BucketVecIterator it(_buckets.begin() + addr);
+		BucketIterator buckIt(std::find(it->begin(), it->end(), value));
+		if (buckIt != it->end())
+			return ConstIterator(it, _buckets.end(), buckIt);
+		else
+			return end();
+	}
+
+	Iterator find(const Value& value)
+		/// Finds an entry in the table.
+	{
+		std::size_t addr = bucketAddress(value);
+		BucketVecIterator it(_buckets.begin() + addr);
+		BucketIterator buckIt(std::find(it->begin(), it->end(), value));
+		if (buckIt != it->end())
+			return Iterator(it, _buckets.end(), buckIt);
+		else
+			return end();
+	}
+	
+	std::size_t count(const Value& value) const
+		/// Returns the number of elements with the given
+		/// value, with is either 1 or 0.
+	{
+		return find(value) != end() ? 1 : 0;
+	}
+	
+	std::pair<Iterator, bool> insert(const Value& value)
+		/// Inserts an element into the table.
+		///
+		/// If the element already exists in the table,
+		/// a pair(iterator, false) with iterator pointing to the 
+		/// existing element is returned.
+		/// Otherwise, the element is inserted an a 
+		/// pair(iterator, true) with iterator
+		/// pointing to the new element is returned.
+	{
+		split();
+		std::size_t addr = bucketAddress(value);
+		BucketVecIterator it(_buckets.begin() + addr);
+		BucketIterator buckIt(std::find(it->begin(), it->end(), value));
+		if (buckIt == it->end())
+		{
+			buckIt = it->insert(buckIt, value);
+			++_size;
+			return std::make_pair(Iterator(it, _buckets.end(), buckIt), true);
+		}
+		else
+		{
+			return std::make_pair(Iterator(it, _buckets.end(), buckIt), false);
+		}
+	}
+	
+	void erase(Iterator it)
+		/// Erases the element pointed to by it.
+	{
+		if (it != end())
+		{
+			it._vecIt->erase(it._buckIt);
+			--_size;
+			merge();
+		}
+	}
+	
+	void erase(const Value& value)
+		/// Erases the element with the given value, if it exists.
+	{
+		Iterator it = find(value);
+		erase(it);
+	}
+	
+	void clear()
+		/// Erases all elements.
+	{
+		LinearHashTable empty;
+		swap(empty);
+	}
+	
+	std::size_t size() const
+		/// Returns the number of elements in the table.
+	{
+		return _size;
+	}
+	
+	bool empty() const
+		/// Returns true iff the table is empty.
+	{
+		return _size == 0;
+	}
+	
+protected:
+	std::size_t bucketAddress(const Value& value) const
+	{
+		std::size_t n = _hash(value);
+		if (n % _front >= _split)
+			return n % _front;
+		else
+			return n % (2*_front);
+	}
+	
+	void split()
+	{
+		if (_split == _front)
+		{
+			_split = 0;
+			_front *= 2;
+			_buckets.reserve(_front*2);
+		}
+		Bucket tmp;
+		_buckets.push_back(tmp);
+		_buckets[_split].swap(tmp);
+		++_split;
+		for (BucketIterator it = tmp.begin(); it != tmp.end(); ++it)
+		{
+			using std::swap;
+			std::size_t addr = bucketAddress(*it);
+			_buckets[addr].push_back(Value());
+			swap(*it, _buckets[addr].back());
+		}
+	}
+	
+	void merge()
+	{
+		if (_split == 0)
+		{
+			_front /= 2;
+			_split = _front;
+		}
+		--_split;
+		Bucket tmp;
+		tmp.swap(_buckets.back());
+		_buckets.pop_back();
+		for (BucketIterator it = tmp.begin(); it != tmp.end(); ++it)
+		{
+			using std::swap;
+			std::size_t addr = bucketAddress(*it);
+			_buckets[addr].push_back(Value());
+			swap(*it, _buckets[addr].back());
+		}
+	}
+	
+	static std::size_t calcSize(std::size_t initialSize)
+	{
+		std::size_t size = 32;
+		while (size < initialSize) size *= 2;
+		return size;
+	}
+	
+private:
+	// Evil hack: _buckets must be mutable because both ConstIterator and Iterator hold 
+	// ordinary iterator's (not const_iterator's).
+	mutable BucketVec _buckets;
+	std::size_t _split;
+	std::size_t _front;
+	std::size_t _size;
+	HashFunc    _hash;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_LinearHashTable_INCLUDED
diff --git a/Foundation/include/Poco/MetaProgramming.h b/Foundation/include/Poco/MetaProgramming.h
index ac19ed056..1a9a41ae0 100644
--- a/Foundation/include/Poco/MetaProgramming.h
+++ b/Foundation/include/Poco/MetaProgramming.h
@@ -1,157 +1,157 @@
-//
-// TypeChecks.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/MetaProgramming.h#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  MetaProgramming
-//
-// Common definitions useful for Meta Template Programming
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_TypeChecks_INCLUDED
-#define  Foundation_TypeChecks_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-namespace Poco {
-
-
-template <typename T>
-struct IsReference
-	///Use this struct to determine if a template type is a reference
-{
-	enum 
-	{
-		VALUE = 0
-	};
-};
-
-
-template <typename T>
-struct IsReference<T&>
-{
-	enum 
-	{
-		VALUE = 1
-	};
-};
-
-
-template <typename T>
-struct IsReference<const T&>
-{
-	enum 
-	{
-		VALUE = 1
-	};
-};
-
-
-
-template <typename T>
-struct IsConst
-	///Use this struct to determine if a template type is a const type
-{
-	enum 
-	{
-		VALUE = 0
-	};
-};
-
-
-template <typename T>
-struct IsConst<const T&>
-{
-	enum 
-	{
-		VALUE = 1
-	};
-};
-
-
-template <typename T>
-struct IsConst<const T>
-{
-	enum 
-	{
-		VALUE = 1
-	};
-};
-
-
-template <typename T>
-struct TypeWrapper
-	/// Use the type wrapper if you want to dedecouple constness and references from template types
-{
-	typedef T TYPE;
-	typedef const T CONSTTYPE;
-	typedef T& REFTYPE;
-	typedef const T& CONSTREFTYPE;
-};
-
-
-template <typename T>
-struct TypeWrapper<const T>
-{
-	typedef T TYPE;
-	typedef const T CONSTTYPE;
-	typedef T& REFTYPE;
-	typedef const T& CONSTREFTYPE;
-};
-
-
-template <typename T>
-struct TypeWrapper<const T&>
-{
-	typedef T TYPE;
-	typedef const T CONSTTYPE;
-	typedef T& REFTYPE;
-	typedef const T& CONSTREFTYPE;
-};
-
-
-template <typename T>
-struct TypeWrapper<T&>
-{
-	typedef T TYPE;
-	typedef const T CONSTTYPE;
-	typedef T& REFTYPE;
-	typedef const T& CONSTREFTYPE;
-};
-
-
-
-} // namespace Poco
-
-
-#endif
+//
+// TypeChecks.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/MetaProgramming.h#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  MetaProgramming
+//
+// Common definitions useful for Meta Template Programming
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_TypeChecks_INCLUDED
+#define  Foundation_TypeChecks_INCLUDED
+
+
+#include "Poco/Foundation.h"
+
+
+namespace Poco {
+
+
+template <typename T>
+struct IsReference
+	///Use this struct to determine if a template type is a reference
+{
+	enum 
+	{
+		VALUE = 0
+	};
+};
+
+
+template <typename T>
+struct IsReference<T&>
+{
+	enum 
+	{
+		VALUE = 1
+	};
+};
+
+
+template <typename T>
+struct IsReference<const T&>
+{
+	enum 
+	{
+		VALUE = 1
+	};
+};
+
+
+
+template <typename T>
+struct IsConst
+	///Use this struct to determine if a template type is a const type
+{
+	enum 
+	{
+		VALUE = 0
+	};
+};
+
+
+template <typename T>
+struct IsConst<const T&>
+{
+	enum 
+	{
+		VALUE = 1
+	};
+};
+
+
+template <typename T>
+struct IsConst<const T>
+{
+	enum 
+	{
+		VALUE = 1
+	};
+};
+
+
+template <typename T>
+struct TypeWrapper
+	/// Use the type wrapper if you want to dedecouple constness and references from template types
+{
+	typedef T TYPE;
+	typedef const T CONSTTYPE;
+	typedef T& REFTYPE;
+	typedef const T& CONSTREFTYPE;
+};
+
+
+template <typename T>
+struct TypeWrapper<const T>
+{
+	typedef T TYPE;
+	typedef const T CONSTTYPE;
+	typedef T& REFTYPE;
+	typedef const T& CONSTREFTYPE;
+};
+
+
+template <typename T>
+struct TypeWrapper<const T&>
+{
+	typedef T TYPE;
+	typedef const T CONSTTYPE;
+	typedef T& REFTYPE;
+	typedef const T& CONSTREFTYPE;
+};
+
+
+template <typename T>
+struct TypeWrapper<T&>
+{
+	typedef T TYPE;
+	typedef const T CONSTTYPE;
+	typedef T& REFTYPE;
+	typedef const T& CONSTREFTYPE;
+};
+
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/NamedTuple.h b/Foundation/include/Poco/NamedTuple.h
index 3bf5bee6f..9f53c8a6b 100644
--- a/Foundation/include/Poco/NamedTuple.h
+++ b/Foundation/include/Poco/NamedTuple.h
@@ -1,4484 +1,4484 @@
-//
-// NamedTuple.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/NamedTuple.h#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  NamedTuple
-//
-// Definition of the NamedTuple class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_NamedTuple_INCLUDED
-#define Foundation_NamedTuple_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/Tuple.h"
-#include "Poco/TypeList.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/Format.h"
-
-
-namespace Poco {
-
-
-template<class T0, 
-    class T1 = NullTypeList,
-    class T2 = NullTypeList,
-    class T3 = NullTypeList,
-    class T4 = NullTypeList,
-    class T5 = NullTypeList,
-    class T6 = NullTypeList,
-    class T7 = NullTypeList, 
-    class T8 = NullTypeList,
-    class T9 = NullTypeList,
-    class T10 = NullTypeList,
-    class T11 = NullTypeList,
-    class T12 = NullTypeList,
-    class T13 = NullTypeList,
-    class T14 = NullTypeList,
-    class T15 = NullTypeList,
-    class T16 = NullTypeList,
-    class T17 = NullTypeList,
-    class T18 = NullTypeList,
-    class T19 = NullTypeList>
-struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::Type Type;
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames)
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-        typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
-        typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-        const std::string& n14 = "O",
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-        const std::string& n15 = "P",
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-        const std::string& n16 = "Q",
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
-        const std::string& n17 = "R",
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
-        const std::string& n18 = "S",
-        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
-		const std::string& n19 = "T",
-        typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-					case 14: return TupleType::template get<14>();
-					case 15: return TupleType::template get<15>();
-					case 16: return TupleType::template get<16>();
-					case 17: return TupleType::template get<17>();
-					case 18: return TupleType::template get<18>();
-					case 19: return TupleType::template get<19>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-        throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-	void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N",
-        const std::string& n14 = "O",
-        const std::string& n15 = "P",
-        const std::string& n16 = "Q",
-        const std::string& n17 = "R",
-        const std::string& n18 = "S",
-        const std::string& n19 = "T")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-			_pNames->push_back(n17); 
-			_pNames->push_back(n18); 
-			_pNames->push_back(n19); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12,
-    class T13,
-    class T14,
-    class T15,
-    class T16,
-    class T17,
-    class T18>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::Type Type;
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
-        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-        const std::string& n14 = "O",
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-        const std::string& n15 = "P",
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-        const std::string& n16 = "Q",
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
-        const std::string& n17 = "R",
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
-        const std::string& n18 = "S",
-        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-					case 14: return TupleType::template get<14>();
-					case 15: return TupleType::template get<15>();
-					case 16: return TupleType::template get<16>();
-					case 17: return TupleType::template get<17>();
-					case 18: return TupleType::template get<18>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N",
-        const std::string& n14 = "O",
-        const std::string& n15 = "P",
-        const std::string& n16 = "Q",
-        const std::string& n17 = "R",
-        const std::string& n18 = "S")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-			_pNames->push_back(n17); 
-			_pNames->push_back(n18); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12,
-    class T13,
-    class T14,
-    class T15,
-    class T16,
-    class T17>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::Type Type;
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames)
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-        const std::string& n14 = "O",
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-        const std::string& n15 = "P",
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-        const std::string& n16 = "Q",
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
-        const std::string& n17 = "R",
-        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-					case 14: return TupleType::template get<14>();
-					case 15: return TupleType::template get<15>();
-					case 16: return TupleType::template get<16>();
-					case 17: return TupleType::template get<17>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N",
-        const std::string& n14 = "O",
-        const std::string& n15 = "P",
-        const std::string& n16 = "Q",
-        const std::string& n17 = "R")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-			_pNames->push_back(n17); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12,
-    class T13,
-    class T14,
-    class T15,
-    class T16>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::Type Type;
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-        const std::string& n14 = "O",
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-        const std::string& n15 = "P",
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-        const std::string& n16 = "Q",
-        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-					case 14: return TupleType::template get<14>();
-					case 15: return TupleType::template get<15>();
-					case 16: return TupleType::template get<16>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N",
-        const std::string& n14 = "O",
-        const std::string& n15 = "P",
-        const std::string& n16 = "Q")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-			_pNames->push_back(n16); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12,
-    class T13,
-    class T14,
-    class T15>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-        const std::string& n14 = "O",
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-        const std::string& n15 = "P",
-        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-					case 14: return TupleType::template get<14>();
-					case 15: return TupleType::template get<15>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N",
-        const std::string& n14 = "O",
-        const std::string& n15 = "P")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-			_pNames->push_back(n15); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12,
-    class T13,
-    class T14>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-        const std::string& n14 = "O",
-        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-					case 14: return TupleType::template get<14>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N",
-        const std::string& n14 = "O")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-			_pNames->push_back(n14); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12,
-    class T13>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-        const std::string& n13 = "N",
-        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-					case 13: return TupleType::template get<13>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M",
-        const std::string& n13 = "N")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-			_pNames->push_back(n13); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11,
-    class T12>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-        const std::string& n12 = "M",
-        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
-    TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-					case 12: return TupleType::template get<12>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L",
-        const std::string& n12 = "M")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-			_pNames->push_back(n12); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10,
-    class T11>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-        const std::string& n11 = "L",
-        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-					case 11: return TupleType::template get<11>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K",
-        const std::string& n11 = "L")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-			_pNames->push_back(n11); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9,
-    class T10>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-        const std::string& n10 = "K",
-        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
-    TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-					case 10: return TupleType::template get<10>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J",
-        const std::string& n10 = "K")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-			_pNames->push_back(n10); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8,
-    class T9>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
-        const std::string& n9 = "J",
-        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    case 9: return TupleType::template get<9>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I",
-        const std::string& n9 = "J")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-            _pNames->push_back(n9); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7, 
-    class T8>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-        const std::string& n8 = "I",
-        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7,n8);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    case 8: return TupleType::template get<8>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H",
-        const std::string& n8 = "I")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-            _pNames->push_back(n8);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6,
-    class T7>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
-        const std::string& n7 = "H",
-        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
-		TupleType(t0,t1,t2,t3,t4,t5,t6,t7), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6,n7);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    case 7: return TupleType::template get<7>(); 
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G",
-        const std::string& n7 = "H")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-            _pNames->push_back(n7);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5,
-    class T6>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5,T6>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5,T6> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
-    TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
-    TupleType(t0,t1,t2,t3,t4,t5,t6)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-        const std::string& n6 = "G",
-        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
-    TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5,n6);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    case 6: return TupleType::template get<6>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F", 
-        const std::string& n6 = "G")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-            _pNames->push_back(n6);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4,
-    class T5>
-struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4,T5>
-{
-	typedef Tuple<T0,T1,T2,T3,T4,T5> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4,T5>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
-    TupleType(t0,t1,t2,t3,t4,t5), _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
-    TupleType(t0,t1,t2,t3,t4,t5)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
-        const std::string& n5 = "F",
-        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
-    TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4,n5);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    case 5: return TupleType::template get<5>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E",
-        const std::string& n5 = "F")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-            _pNames->push_back(n5);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3,
-    class T4>
-struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
-	public Tuple<T0,T1,T2,T3,T4>
-{
-	typedef Tuple<T0,T1,T2,T3,T4> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3,T4>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
-		TupleType(t0,t1,t2,t3,t4), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
-		TupleType(t0,t1,t2,t3,t4)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-        const std::string& n4 = "E",
-        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
-		TupleType(t0,t1,t2,t3,t4), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2,n3,n4);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    case 4: return TupleType::template get<4>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D",
-        const std::string& n4 = "E")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-            _pNames->push_back(n4);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2,
-    class T3>
-struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
-	public Tuple<T0,T1,T2,T3>
-{
-	typedef Tuple<T0,T1,T2,T3> TupleType;
-	typedef typename Tuple<T0,T1,T2,T3>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
-		TupleType(t0,t1,t2,t3), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
-		TupleType(t0,t1,t2,t3)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
-        const std::string& n3 = "D",
-        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
-    TupleType(t0,t1,t2,t3), _pNames(0) 
-    {
-        init(n0,n1,n2,n3);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    case 3: return TupleType::template get<3>(); 
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C",
-        const std::string& n3 = "D")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-            _pNames->push_back(n3); 
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1,
-    class T2>
-struct NamedTuple<T0,T1,T2,NullTypeList>:
-	public Tuple<T0,T1,T2>
-{
-	typedef Tuple<T0,T1,T2> TupleType;
-	typedef typename Tuple<T0,T1,T2>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
-		TupleType(t0,t1,t2), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
-		TupleType(t0,t1,t2)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-        const std::string& n2 = "C",
-        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
-		TupleType(t0,t1,t2), 
-		_pNames(0) 
-    {
-        init(n0,n1,n2);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    case 2: return TupleType::template get<2>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B",
-        const std::string& n2 = "C")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-            _pNames->push_back(n2);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0, 
-    class T1>
-struct NamedTuple<T0,T1,NullTypeList>:
-	public Tuple<T0,T1>
-{
-	typedef Tuple<T0,T1> TupleType;
-	typedef typename Tuple<T0,T1>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
-		TupleType(t0,t1), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0,
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
-		TupleType(t0,t1)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0,
-        typename TypeWrapper<T0>::CONSTTYPE& t0, 
-        const std::string& n1 = "B",
-        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
-		TupleType(t0,t1), 
-		_pNames(0) 
-    {
-        init(n0,n1);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    case 1: return TupleType::template get<1>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A",
-        const std::string& n1 = "B")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-            _pNames->push_back(n1);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-template<class T0>
-struct NamedTuple<T0,NullTypeList>:
-	public Tuple<T0>
-{
-	typedef Tuple<T0> TupleType;
-	typedef typename Tuple<T0>::Type Type;
-
-    typedef std::vector<std::string> NameVec; 
-    typedef SharedPtr<NameVec> NameVecPtr; 
-
-    NamedTuple(): _pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames) 
-    {
-        if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0): 
-		TupleType(t0), 
-		_pNames(0)
-    {
-        init();
-    }
-
-    NamedTuple(const NameVecPtr& rNames, 
-        typename TypeWrapper<T0>::CONSTTYPE& t0): 
-		TupleType(t0)
-    {
-		if (rNames->size() != TupleType::length)
-            throw InvalidArgumentException("Wrong names vector length."); 
-
-        _pNames = rNames;
-    }
-
-    NamedTuple(const std::string& n0, typename TypeWrapper<T0>::CONSTTYPE& t0): 
-		TupleType(t0), 
-		_pNames(0) 
-    {
-        init(n0);
-    }
-
-    DynamicAny get(const std::string& name) const
-    {
-        NameVec::const_iterator it = _pNames->begin(); 
-        NameVec::const_iterator itEnd = _pNames->end();
-
-        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
-        {
-            if (name == *it)
-            {
-                switch (counter)
-                { 
-                    case 0: return TupleType::template get<0>();
-                    default: throw RangeException();
-                }
-            }
-        } 
-
-		throw NotFoundException("Name not found: " + name);
-    }
-
-    DynamicAny operator [] (const std::string& name) const
-    {
-        return get(name);
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::ConstHeadType& get() const 
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    typename TypeGetter<N, Type>::HeadType& get()
-    {
-        return TupleType::template get<N>();
-    }
-
-    template<int N>
-    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-    {
-        return TupleType::template set<N>(val);
-    }
-
-    const NameVecPtr& names()
-    {
-        return _pNames; 
-    }
-
-    void setName(std::size_t index, const std::string& name)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		(*_pNames)[index] = name;
-	}
-
-	const std::string& getName(std::size_t index)
-	{
-		if (index >= _pNames->size())
-			throw InvalidArgumentException(format("Invalid index: %z", index));
-
-		return (*_pNames)[index];
-	}
-
-    bool operator == (const NamedTuple& other) const
-    {
-        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
-    }
-
-    bool operator != (const NamedTuple& other) const 
-    {
-        return !(*this == other);
-    }
-
-    bool operator < (const NamedTuple& other) const
-    {
-        TupleType th(*this);
-        TupleType oth(other); 
-
-        return (th < oth && _pNames == other._pNames) || 
-            (th == oth && _pNames < other._pNames) ||
-            (th < oth && _pNames < other._pNames);
-    }
-
-private:
-    void init(const std::string& n0 = "A")
-    { 
-        if (!_pNames)
-        {
-            _pNames = new NameVec;
-            _pNames->push_back(n0);
-        }
-    }
-
-    NameVecPtr _pNames;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Tuple_INCLUDED
+//
+// NamedTuple.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/NamedTuple.h#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  NamedTuple
+//
+// Definition of the NamedTuple class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_NamedTuple_INCLUDED
+#define Foundation_NamedTuple_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/Tuple.h"
+#include "Poco/TypeList.h"
+#include "Poco/DynamicAny.h"
+#include "Poco/SharedPtr.h"
+#include "Poco/Format.h"
+
+
+namespace Poco {
+
+
+template<class T0, 
+    class T1 = NullTypeList,
+    class T2 = NullTypeList,
+    class T3 = NullTypeList,
+    class T4 = NullTypeList,
+    class T5 = NullTypeList,
+    class T6 = NullTypeList,
+    class T7 = NullTypeList, 
+    class T8 = NullTypeList,
+    class T9 = NullTypeList,
+    class T10 = NullTypeList,
+    class T11 = NullTypeList,
+    class T12 = NullTypeList,
+    class T13 = NullTypeList,
+    class T14 = NullTypeList,
+    class T15 = NullTypeList,
+    class T16 = NullTypeList,
+    class T17 = NullTypeList,
+    class T18 = NullTypeList,
+    class T19 = NullTypeList>
+struct NamedTuple: public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::Type Type;
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames)
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
+        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+        typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
+        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18), 
+        typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+        const std::string& n14 = "O",
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+        const std::string& n15 = "P",
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+        const std::string& n16 = "Q",
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+        const std::string& n17 = "R",
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+        const std::string& n18 = "S",
+        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		const std::string& n19 = "T",
+        typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18,n19);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+					case 14: return TupleType::template get<14>();
+					case 15: return TupleType::template get<15>();
+					case 16: return TupleType::template get<16>();
+					case 17: return TupleType::template get<17>();
+					case 18: return TupleType::template get<18>();
+					case 19: return TupleType::template get<19>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+        throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+	void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N",
+        const std::string& n14 = "O",
+        const std::string& n15 = "P",
+        const std::string& n16 = "Q",
+        const std::string& n17 = "R",
+        const std::string& n18 = "S",
+        const std::string& n19 = "T")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+			_pNames->push_back(n14); 
+			_pNames->push_back(n15); 
+			_pNames->push_back(n16); 
+			_pNames->push_back(n17); 
+			_pNames->push_back(n18); 
+			_pNames->push_back(n19); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12,
+    class T13,
+    class T14,
+    class T15,
+    class T16,
+    class T17,
+    class T18>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::Type Type;
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
+        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17), 
+        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+        const std::string& n14 = "O",
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+        const std::string& n15 = "P",
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+        const std::string& n16 = "Q",
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+        const std::string& n17 = "R",
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+        const std::string& n18 = "S",
+        typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,n18);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+					case 14: return TupleType::template get<14>();
+					case 15: return TupleType::template get<15>();
+					case 16: return TupleType::template get<16>();
+					case 17: return TupleType::template get<17>();
+					case 18: return TupleType::template get<18>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N",
+        const std::string& n14 = "O",
+        const std::string& n15 = "P",
+        const std::string& n16 = "Q",
+        const std::string& n17 = "R",
+        const std::string& n18 = "S")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+			_pNames->push_back(n14); 
+			_pNames->push_back(n15); 
+			_pNames->push_back(n16); 
+			_pNames->push_back(n17); 
+			_pNames->push_back(n18); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12,
+    class T13,
+    class T14,
+    class T15,
+    class T16,
+    class T17>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::Type Type;
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames)
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16), 
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+        const std::string& n14 = "O",
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+        const std::string& n15 = "P",
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+        const std::string& n16 = "Q",
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+        const std::string& n17 = "R",
+        typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+					case 14: return TupleType::template get<14>();
+					case 15: return TupleType::template get<15>();
+					case 16: return TupleType::template get<16>();
+					case 17: return TupleType::template get<17>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N",
+        const std::string& n14 = "O",
+        const std::string& n15 = "P",
+        const std::string& n16 = "Q",
+        const std::string& n17 = "R")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+			_pNames->push_back(n14); 
+			_pNames->push_back(n15); 
+			_pNames->push_back(n16); 
+			_pNames->push_back(n17); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12,
+    class T13,
+    class T14,
+    class T15,
+    class T16>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::Type Type;
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15), 
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+        const std::string& n14 = "O",
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+        const std::string& n15 = "P",
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+        const std::string& n16 = "Q",
+        typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+					case 14: return TupleType::template get<14>();
+					case 15: return TupleType::template get<15>();
+					case 16: return TupleType::template get<16>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N",
+        const std::string& n14 = "O",
+        const std::string& n15 = "P",
+        const std::string& n16 = "Q")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+			_pNames->push_back(n14); 
+			_pNames->push_back(n15); 
+			_pNames->push_back(n16); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12,
+    class T13,
+    class T14,
+    class T15>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14), 
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+        const std::string& n14 = "O",
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+        const std::string& n15 = "P",
+        typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+					case 14: return TupleType::template get<14>();
+					case 15: return TupleType::template get<15>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N",
+        const std::string& n14 = "O",
+        const std::string& n15 = "P")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+			_pNames->push_back(n14); 
+			_pNames->push_back(n15); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12,
+    class T13,
+    class T14>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13), 
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+        const std::string& n14 = "O",
+        typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+					case 14: return TupleType::template get<14>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N",
+        const std::string& n14 = "O")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+			_pNames->push_back(n14); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12,
+    class T13>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12), 
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+        const std::string& n13 = "N",
+        typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+					case 13: return TupleType::template get<13>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M",
+        const std::string& n13 = "N")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+			_pNames->push_back(n13); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11,
+    class T12>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11), 
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+        const std::string& n12 = "M",
+        typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)): 
+    TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12), _pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+					case 12: return TupleType::template get<12>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L",
+        const std::string& n12 = "M")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+			_pNames->push_back(n12); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10,
+    class T11>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10), 
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+        const std::string& n11 = "L",
+        typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+					case 11: return TupleType::template get<11>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K",
+        const std::string& n11 = "L")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+			_pNames->push_back(n11); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9,
+    class T10>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9), 
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+        const std::string& n10 = "K",
+        typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)): 
+    TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10), _pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+					case 10: return TupleType::template get<10>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J",
+        const std::string& n10 = "K")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+			_pNames->push_back(n10); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8,
+    class T9>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8), 
+        const std::string& n9 = "J",
+        typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8,t9), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    case 9: return TupleType::template get<9>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I",
+        const std::string& n9 = "J")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+            _pNames->push_back(n9); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7, 
+    class T8>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+        const std::string& n8 = "I",
+        typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7,t8), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7,n8);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    case 8: return TupleType::template get<8>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H",
+        const std::string& n8 = "I")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+            _pNames->push_back(n8);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6,
+    class T7>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,T7,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6,T7>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6,T7> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6,T7>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6), 
+        const std::string& n7 = "H",
+        typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)): 
+		TupleType(t0,t1,t2,t3,t4,t5,t6,t7), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6,n7);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    case 7: return TupleType::template get<7>(); 
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G",
+        const std::string& n7 = "H")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+            _pNames->push_back(n7);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5,
+    class T6>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,T6,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5,T6>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5,T6> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5,T6>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
+    TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5), 
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
+    TupleType(t0,t1,t2,t3,t4,t5,t6)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+        const std::string& n6 = "G",
+        typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)): 
+    TupleType(t0,t1,t2,t3,t4,t5,t6), _pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5,n6);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    case 6: return TupleType::template get<6>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F", 
+        const std::string& n6 = "G")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+            _pNames->push_back(n6);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4,
+    class T5>
+struct NamedTuple<T0,T1,T2,T3,T4,T5,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4,T5>
+{
+	typedef Tuple<T0,T1,T2,T3,T4,T5> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4,T5>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
+    TupleType(t0,t1,t2,t3,t4,t5), _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
+    TupleType(t0,t1,t2,t3,t4,t5)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4), 
+        const std::string& n5 = "F",
+        typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)): 
+    TupleType(t0,t1,t2,t3,t4,t5), _pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4,n5);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    case 5: return TupleType::template get<5>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E",
+        const std::string& n5 = "F")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+            _pNames->push_back(n5);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3,
+    class T4>
+struct NamedTuple<T0,T1,T2,T3,T4,NullTypeList>:
+	public Tuple<T0,T1,T2,T3,T4>
+{
+	typedef Tuple<T0,T1,T2,T3,T4> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3,T4>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
+		TupleType(t0,t1,t2,t3,t4), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
+		TupleType(t0,t1,t2,t3,t4)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+        const std::string& n4 = "E",
+        typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)): 
+		TupleType(t0,t1,t2,t3,t4), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2,n3,n4);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    case 4: return TupleType::template get<4>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D",
+        const std::string& n4 = "E")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+            _pNames->push_back(n4);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2,
+    class T3>
+struct NamedTuple<T0,T1,T2,T3,NullTypeList>:
+	public Tuple<T0,T1,T2,T3>
+{
+	typedef Tuple<T0,T1,T2,T3> TupleType;
+	typedef typename Tuple<T0,T1,T2,T3>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
+		TupleType(t0,t1,t2,t3), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
+		TupleType(t0,t1,t2,t3)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2), 
+        const std::string& n3 = "D",
+        typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)): 
+    TupleType(t0,t1,t2,t3), _pNames(0) 
+    {
+        init(n0,n1,n2,n3);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    case 3: return TupleType::template get<3>(); 
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C",
+        const std::string& n3 = "D")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+            _pNames->push_back(n3); 
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1,
+    class T2>
+struct NamedTuple<T0,T1,T2,NullTypeList>:
+	public Tuple<T0,T1,T2>
+{
+	typedef Tuple<T0,T1,T2> TupleType;
+	typedef typename Tuple<T0,T1,T2>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1), 
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
+		TupleType(t0,t1,t2), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
+		TupleType(t0,t1,t2)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+        const std::string& n2 = "C",
+        typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)): 
+		TupleType(t0,t1,t2), 
+		_pNames(0) 
+    {
+        init(n0,n1,n2);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    case 2: return TupleType::template get<2>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B",
+        const std::string& n2 = "C")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+            _pNames->push_back(n2);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0, 
+    class T1>
+struct NamedTuple<T0,T1,NullTypeList>:
+	public Tuple<T0,T1>
+{
+	typedef Tuple<T0,T1> TupleType;
+	typedef typename Tuple<T0,T1>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
+		TupleType(t0,t1), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0,
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
+		TupleType(t0,t1)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0,
+        typename TypeWrapper<T0>::CONSTTYPE& t0, 
+        const std::string& n1 = "B",
+        typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)): 
+		TupleType(t0,t1), 
+		_pNames(0) 
+    {
+        init(n0,n1);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    case 1: return TupleType::template get<1>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A",
+        const std::string& n1 = "B")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+            _pNames->push_back(n1);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+template<class T0>
+struct NamedTuple<T0,NullTypeList>:
+	public Tuple<T0>
+{
+	typedef Tuple<T0> TupleType;
+	typedef typename Tuple<T0>::Type Type;
+
+    typedef std::vector<std::string> NameVec; 
+    typedef SharedPtr<NameVec> NameVecPtr; 
+
+    NamedTuple(): _pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames) 
+    {
+        if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(typename TypeWrapper<T0>::CONSTTYPE& t0): 
+		TupleType(t0), 
+		_pNames(0)
+    {
+        init();
+    }
+
+    NamedTuple(const NameVecPtr& rNames, 
+        typename TypeWrapper<T0>::CONSTTYPE& t0): 
+		TupleType(t0)
+    {
+		if (rNames->size() != TupleType::length)
+            throw InvalidArgumentException("Wrong names vector length."); 
+
+        _pNames = rNames;
+    }
+
+    NamedTuple(const std::string& n0, typename TypeWrapper<T0>::CONSTTYPE& t0): 
+		TupleType(t0), 
+		_pNames(0) 
+    {
+        init(n0);
+    }
+
+    DynamicAny get(const std::string& name) const
+    {
+        NameVec::const_iterator it = _pNames->begin(); 
+        NameVec::const_iterator itEnd = _pNames->end();
+
+        for(std::size_t counter = 0; it != itEnd; ++it, ++counter)
+        {
+            if (name == *it)
+            {
+                switch (counter)
+                { 
+                    case 0: return TupleType::template get<0>();
+                    default: throw RangeException();
+                }
+            }
+        } 
+
+		throw NotFoundException("Name not found: " + name);
+    }
+
+    DynamicAny operator [] (const std::string& name) const
+    {
+        return get(name);
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::ConstHeadType& get() const 
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    typename TypeGetter<N, Type>::HeadType& get()
+    {
+        return TupleType::template get<N>();
+    }
+
+    template<int N>
+    void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+    {
+        return TupleType::template set<N>(val);
+    }
+
+    const NameVecPtr& names()
+    {
+        return _pNames; 
+    }
+
+    void setName(std::size_t index, const std::string& name)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		(*_pNames)[index] = name;
+	}
+
+	const std::string& getName(std::size_t index)
+	{
+		if (index >= _pNames->size())
+			throw InvalidArgumentException(format("Invalid index: %z", index));
+
+		return (*_pNames)[index];
+	}
+
+    bool operator == (const NamedTuple& other) const
+    {
+        return TupleType(*this) == TupleType(other) && _pNames == other._pNames;
+    }
+
+    bool operator != (const NamedTuple& other) const 
+    {
+        return !(*this == other);
+    }
+
+    bool operator < (const NamedTuple& other) const
+    {
+        TupleType th(*this);
+        TupleType oth(other); 
+
+        return (th < oth && _pNames == other._pNames) || 
+            (th == oth && _pNames < other._pNames) ||
+            (th < oth && _pNames < other._pNames);
+    }
+
+private:
+    void init(const std::string& n0 = "A")
+    { 
+        if (!_pNames)
+        {
+            _pNames = new NameVec;
+            _pNames->push_back(n0);
+        }
+    }
+
+    NameVecPtr _pNames;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_Tuple_INCLUDED
diff --git a/Foundation/include/Poco/ScopedUnlock.h b/Foundation/include/Poco/ScopedUnlock.h
index c7691bb90..d56676aa8 100644
--- a/Foundation/include/Poco/ScopedUnlock.h
+++ b/Foundation/include/Poco/ScopedUnlock.h
@@ -1,79 +1,79 @@
-//
-// ScopedUnlock.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/ScopedUnlock.h#2 $
-//
-// Library: Foundation
-// Package: Threading
-// Module:  Mutex
-//
-// Definition of the ScopedUnlock template class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_ScopedUnlock_INCLUDED
-#define Foundation_ScopedUnlock_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-namespace Poco {
-
-
-template <class M>
-class ScopedUnlock
-	/// A class that simplifies thread synchronization
-	/// with a mutex.
-	/// The constructor accepts a Mutex and unlocks it.
-	/// The destructor unlocks the mutex.
-{
-public:
-	inline ScopedUnlock(M& mutex, bool unlockNow = true): _mutex(mutex)
-	{
-		if (unlockNow)
-			_mutex.unlock();
-	}
-	inline ~ScopedUnlock()
-	{
-		_mutex.lock();
-	}
-
-private:
-	M& _mutex;
-
-	ScopedUnlock();
-	ScopedUnlock(const ScopedUnlock&);
-	ScopedUnlock& operator = (const ScopedUnlock&);
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_ScopedUnlock_INCLUDED
+//
+// ScopedUnlock.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/ScopedUnlock.h#2 $
+//
+// Library: Foundation
+// Package: Threading
+// Module:  Mutex
+//
+// Definition of the ScopedUnlock template class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_ScopedUnlock_INCLUDED
+#define Foundation_ScopedUnlock_INCLUDED
+
+
+#include "Poco/Foundation.h"
+
+
+namespace Poco {
+
+
+template <class M>
+class ScopedUnlock
+	/// A class that simplifies thread synchronization
+	/// with a mutex.
+	/// The constructor accepts a Mutex and unlocks it.
+	/// The destructor unlocks the mutex.
+{
+public:
+	inline ScopedUnlock(M& mutex, bool unlockNow = true): _mutex(mutex)
+	{
+		if (unlockNow)
+			_mutex.unlock();
+	}
+	inline ~ScopedUnlock()
+	{
+		_mutex.lock();
+	}
+
+private:
+	M& _mutex;
+
+	ScopedUnlock();
+	ScopedUnlock(const ScopedUnlock&);
+	ScopedUnlock& operator = (const ScopedUnlock&);
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_ScopedUnlock_INCLUDED
diff --git a/Foundation/include/Poco/SharedMemory.h b/Foundation/include/Poco/SharedMemory.h
index f5b989315..3d77d5a7f 100644
--- a/Foundation/include/Poco/SharedMemory.h
+++ b/Foundation/include/Poco/SharedMemory.h
@@ -1,135 +1,135 @@
-//
-// SharedMemory.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/SharedMemory.h#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemory
-//
-// Definition of the SharedMemory class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_SharedMemory_INCLUDED
-#define Foundation_SharedMemory_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include <algorithm>
-#include <cstddef>
-
-
-namespace Poco {
-
-
-class SharedMemoryImpl;
-class File;
-
-
-class Foundation_API SharedMemory
-	/// Create and manage a shared memory object.
-	///
-	/// A SharedMemory object has value semantics, but
-	/// is implemented using a handle/implementation idiom.
-	/// Therefore, multiple SharedMemory objects can share
-	/// a single, reference counted SharedMemoryImpl object.
-{
-public:
-	enum AccessMode
-	{
-		AM_READ = 0,
-		AM_WRITE
-	};
-
-	SharedMemory();
-		/// Default constructor creates an unmapped SharedMemory object. 
-		/// No clients can connect to an unmapped SharedMemory object.
-
-	SharedMemory(const std::string& name, std::size_t size, AccessMode mode, const void* addrHint = 0, bool server = true);
-		/// Creates or connects to a shared memory object with the given name.
-		///
-		/// For maximum portability, name should be a valid Unix filename and not
-		/// contain any slashes or backslashes.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-		///
-		/// If server is set to false, the shared memory region will be unlinked
-		/// by calling shm_unlink (on POSIX platforms) when the SharedMemory object is destroyed.
-		/// The server parameter is ignored on Windows platforms.
-
-	SharedMemory(const File& file, AccessMode mode, const void* addrHint = 0);
-		/// Maps the entire contents of file into a shared memory segment.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-
-	SharedMemory(const SharedMemory& other);
-		/// Creates a SharedMemory object by copying another one.
-
-	~SharedMemory();
-		/// Destroys the SharedMemory.
-
-	SharedMemory& operator = (const SharedMemory& other);
-		/// Assigns another SharedMemory object.
-
-	void swap(SharedMemory& other);
-		/// Swaps the SharedMemory object with another one.
-
-	char* begin() const;
-		/// Returns the start address of the shared memory segment.
-		/// Will be NULL for illegal segments.
-
-	char* end() const;
-		/// Returns the one-past-end end address of the shared memory segment. 
-		/// Will be NULL for illegal segments.
-
-private:
-	SharedMemoryImpl* _pImpl;
-};
-
-
-//
-// inlines
-//
-inline void SharedMemory::swap(SharedMemory& other)
-{
-	using std::swap;
-	swap(_pImpl, other._pImpl);
-}
-
-
-} // namespace Poco::Poco
-
-
-#endif // Foundation_SharedMemory_INCLUDED
+//
+// SharedMemory.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/SharedMemory.h#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemory
+//
+// Definition of the SharedMemory class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_SharedMemory_INCLUDED
+#define Foundation_SharedMemory_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include <algorithm>
+#include <cstddef>
+
+
+namespace Poco {
+
+
+class SharedMemoryImpl;
+class File;
+
+
+class Foundation_API SharedMemory
+	/// Create and manage a shared memory object.
+	///
+	/// A SharedMemory object has value semantics, but
+	/// is implemented using a handle/implementation idiom.
+	/// Therefore, multiple SharedMemory objects can share
+	/// a single, reference counted SharedMemoryImpl object.
+{
+public:
+	enum AccessMode
+	{
+		AM_READ = 0,
+		AM_WRITE
+	};
+
+	SharedMemory();
+		/// Default constructor creates an unmapped SharedMemory object. 
+		/// No clients can connect to an unmapped SharedMemory object.
+
+	SharedMemory(const std::string& name, std::size_t size, AccessMode mode, const void* addrHint = 0, bool server = true);
+		/// Creates or connects to a shared memory object with the given name.
+		///
+		/// For maximum portability, name should be a valid Unix filename and not
+		/// contain any slashes or backslashes.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+		///
+		/// If server is set to false, the shared memory region will be unlinked
+		/// by calling shm_unlink (on POSIX platforms) when the SharedMemory object is destroyed.
+		/// The server parameter is ignored on Windows platforms.
+
+	SharedMemory(const File& file, AccessMode mode, const void* addrHint = 0);
+		/// Maps the entire contents of file into a shared memory segment.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+
+	SharedMemory(const SharedMemory& other);
+		/// Creates a SharedMemory object by copying another one.
+
+	~SharedMemory();
+		/// Destroys the SharedMemory.
+
+	SharedMemory& operator = (const SharedMemory& other);
+		/// Assigns another SharedMemory object.
+
+	void swap(SharedMemory& other);
+		/// Swaps the SharedMemory object with another one.
+
+	char* begin() const;
+		/// Returns the start address of the shared memory segment.
+		/// Will be NULL for illegal segments.
+
+	char* end() const;
+		/// Returns the one-past-end end address of the shared memory segment. 
+		/// Will be NULL for illegal segments.
+
+private:
+	SharedMemoryImpl* _pImpl;
+};
+
+
+//
+// inlines
+//
+inline void SharedMemory::swap(SharedMemory& other)
+{
+	using std::swap;
+	swap(_pImpl, other._pImpl);
+}
+
+
+} // namespace Poco::Poco
+
+
+#endif // Foundation_SharedMemory_INCLUDED
diff --git a/Foundation/include/Poco/SharedMemory_DUMMY.h b/Foundation/include/Poco/SharedMemory_DUMMY.h
index 1190ed7ce..11fc09c46 100644
--- a/Foundation/include/Poco/SharedMemory_DUMMY.h
+++ b/Foundation/include/Poco/SharedMemory_DUMMY.h
@@ -1,110 +1,110 @@
-//
-// SharedMemoryImpl.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/SharedMemory_DUMMY.h#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Definition of the SharedMemoryImpl class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_SharedMemoryImpl_INCLUDED
-#define Foundation_SharedMemoryImpl_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/SharedMemory.h"
-#include "Poco/RefCountedObject.h"
-
-
-namespace Poco {
-
-
-class Foundation_API SharedMemoryImpl: public RefCountedObject
-	/// A dummy implementation of shared memory, for systems
-	/// that do not have shared memory support.
-{
-public:
-	SharedMemoryImpl(const std::string& id, std::size_t size, SharedMemory::AccessMode mode, const void* addr, bool server);
-		/// Creates or connects to a shared memory object with the given name.
-		///
-		/// For maximum portability, name should be a valid Unix filename and not
-		/// contain any slashes or backslashes.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-
-	SharedMemoryImpl(const Poco::File& aFile, SharedMemory::AccessMode mode, const void* addr);
-		/// Maps the entire contents of file into a shared memory segment.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-
-	char* begin() const;
-		/// Returns the start address of the shared memory segment.
-
-	char* end() const;
-		/// Returns the one-past-end end address of the shared memory segment. 
-
-protected:
-	~SharedMemoryImpl();
-		/// Destroys the SharedMemoryImpl.
-
-private:
-	SharedMemoryImpl();
-	SharedMemoryImpl(const SharedMemoryImpl&);
-	SharedMemoryImpl& operator = (const SharedMemoryImpl&);
-};
-
-
-//
-// inlines
-//
-inline char* SharedMemoryImpl::begin() const
-{
-	return 0;
-}
-
-
-inline char* SharedMemoryImpl::end() const
-{
-	return 0;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_SharedMemoryImpl_INCLUDED
+//
+// SharedMemoryImpl.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/SharedMemory_DUMMY.h#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemoryImpl
+//
+// Definition of the SharedMemoryImpl class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_SharedMemoryImpl_INCLUDED
+#define Foundation_SharedMemoryImpl_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/SharedMemory.h"
+#include "Poco/RefCountedObject.h"
+
+
+namespace Poco {
+
+
+class Foundation_API SharedMemoryImpl: public RefCountedObject
+	/// A dummy implementation of shared memory, for systems
+	/// that do not have shared memory support.
+{
+public:
+	SharedMemoryImpl(const std::string& id, std::size_t size, SharedMemory::AccessMode mode, const void* addr, bool server);
+		/// Creates or connects to a shared memory object with the given name.
+		///
+		/// For maximum portability, name should be a valid Unix filename and not
+		/// contain any slashes or backslashes.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+
+	SharedMemoryImpl(const Poco::File& aFile, SharedMemory::AccessMode mode, const void* addr);
+		/// Maps the entire contents of file into a shared memory segment.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+
+	char* begin() const;
+		/// Returns the start address of the shared memory segment.
+
+	char* end() const;
+		/// Returns the one-past-end end address of the shared memory segment. 
+
+protected:
+	~SharedMemoryImpl();
+		/// Destroys the SharedMemoryImpl.
+
+private:
+	SharedMemoryImpl();
+	SharedMemoryImpl(const SharedMemoryImpl&);
+	SharedMemoryImpl& operator = (const SharedMemoryImpl&);
+};
+
+
+//
+// inlines
+//
+inline char* SharedMemoryImpl::begin() const
+{
+	return 0;
+}
+
+
+inline char* SharedMemoryImpl::end() const
+{
+	return 0;
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_SharedMemoryImpl_INCLUDED
diff --git a/Foundation/include/Poco/SharedMemory_POSIX.h b/Foundation/include/Poco/SharedMemory_POSIX.h
index 0513e4180..ae4893a5d 100644
--- a/Foundation/include/Poco/SharedMemory_POSIX.h
+++ b/Foundation/include/Poco/SharedMemory_POSIX.h
@@ -1,129 +1,129 @@
-//
-// SharedMemoryImpl.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/SharedMemory_POSIX.h#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Definition of the SharedMemoryImpl class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_SharedMemoryImpl_INCLUDED
-#define Foundation_SharedMemoryImpl_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/SharedMemory.h"
-#include "Poco/RefCountedObject.h"
-
-
-namespace Poco {
-
-
-class Foundation_API SharedMemoryImpl: public RefCountedObject
-	/// Shared memory implementation for POSIX platforms.
-{
-public:
-	SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void* addrHint, bool server);
-		/// Creates or connects to a shared memory object with the given name.
-		///
-		/// For maximum portability, name should be a valid Unix filename and not
-		/// contain any slashes or backslashes.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-		///
-		/// If server is set to false, the shared memory region will be unlinked
-		/// by calling shm_unlink when the SharedMemory object is destroyed.
-
-	SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void* addrHint);
-		/// Maps the entire contents of file into a shared memory segment.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-
-	char* begin() const;
-		/// Returns the start address of the shared memory segment.
-
-	char* end() const;
-		/// Returns the one-past-end end address of the shared memory segment. 
-
-protected:
-	void map(const void* addrHint);
-		/// Maps the shared memory object.
-
-	void unmap();
-		/// Unmaps the shared memory object.
-
-	void close();
-		/// Releases the handle for the shared memory segment.
-
-	~SharedMemoryImpl();
-		/// Destroys the SharedMemoryImpl.
-
-private:
-	SharedMemoryImpl();
-	SharedMemoryImpl(const SharedMemoryImpl&);
-	SharedMemoryImpl& operator = (const SharedMemoryImpl&);
-
-	std::size_t _size;
-	int         _fd;
-	char*       _address;
-	SharedMemory::AccessMode _access;
-	std::string _name;
-	bool        _fileMapped;
-	bool        _server;
-};
-
-
-//
-// inlines
-//
-inline char* SharedMemoryImpl::begin() const
-{
-	return _address;
-}
-
-
-inline char* SharedMemoryImpl::end() const
-{
-	return _address + _size;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_SharedMemoryImpl_INCLUDED
+//
+// SharedMemoryImpl.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/SharedMemory_POSIX.h#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemoryImpl
+//
+// Definition of the SharedMemoryImpl class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_SharedMemoryImpl_INCLUDED
+#define Foundation_SharedMemoryImpl_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/SharedMemory.h"
+#include "Poco/RefCountedObject.h"
+
+
+namespace Poco {
+
+
+class Foundation_API SharedMemoryImpl: public RefCountedObject
+	/// Shared memory implementation for POSIX platforms.
+{
+public:
+	SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void* addrHint, bool server);
+		/// Creates or connects to a shared memory object with the given name.
+		///
+		/// For maximum portability, name should be a valid Unix filename and not
+		/// contain any slashes or backslashes.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+		///
+		/// If server is set to false, the shared memory region will be unlinked
+		/// by calling shm_unlink when the SharedMemory object is destroyed.
+
+	SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void* addrHint);
+		/// Maps the entire contents of file into a shared memory segment.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+
+	char* begin() const;
+		/// Returns the start address of the shared memory segment.
+
+	char* end() const;
+		/// Returns the one-past-end end address of the shared memory segment. 
+
+protected:
+	void map(const void* addrHint);
+		/// Maps the shared memory object.
+
+	void unmap();
+		/// Unmaps the shared memory object.
+
+	void close();
+		/// Releases the handle for the shared memory segment.
+
+	~SharedMemoryImpl();
+		/// Destroys the SharedMemoryImpl.
+
+private:
+	SharedMemoryImpl();
+	SharedMemoryImpl(const SharedMemoryImpl&);
+	SharedMemoryImpl& operator = (const SharedMemoryImpl&);
+
+	std::size_t _size;
+	int         _fd;
+	char*       _address;
+	SharedMemory::AccessMode _access;
+	std::string _name;
+	bool        _fileMapped;
+	bool        _server;
+};
+
+
+//
+// inlines
+//
+inline char* SharedMemoryImpl::begin() const
+{
+	return _address;
+}
+
+
+inline char* SharedMemoryImpl::end() const
+{
+	return _address + _size;
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_SharedMemoryImpl_INCLUDED
diff --git a/Foundation/include/Poco/SharedMemory_WIN32.h b/Foundation/include/Poco/SharedMemory_WIN32.h
index aa9fe1283..a0c426657 100644
--- a/Foundation/include/Poco/SharedMemory_WIN32.h
+++ b/Foundation/include/Poco/SharedMemory_WIN32.h
@@ -1,125 +1,125 @@
-//
-// SharedMemoryImpl.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/SharedMemory_WIN32.h#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Definition of the SharedMemoryImpl class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_SharedMemoryImpl_INCLUDED
-#define Foundation_SharedMemoryImpl_INCLUDED
-
-
-#include "Poco/Poco.h"
-#include "Poco/SharedMemory.h"
-#include "Poco/RefCountedObject.h"
-
-
-namespace Poco {
-
-
-class Foundation_API SharedMemoryImpl: public RefCountedObject
-	/// Shared memory implementation for Windows platforms.
-{
-public:
-	SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void* addrHint, bool server);
-		/// Creates or connects to a shared memory object with the given name.
-		///
-		/// For maximum portability, name should be a valid Unix filename and not
-		/// contain any slashes or backslashes.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-
-	SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void* addrHint);
-		/// Maps the entire contents of file into a shared memory segment.
-		///
-		/// An address hint can be passed to the system, specifying the desired
-		/// start address of the shared memory area. Whether the hint
-		/// is actually honored is, however, up to the system. Windows platform
-		/// will generally ignore the hint.
-
-	char* begin() const;
-		/// Returns the beginn address of the SharedMemory segment. Will be null for illegal segments.
-
-	char* end() const;
-		/// Points past the last byte of the end address of the SharedMemory segment. Will be null for illegal segments.
-
-protected:
-	void map();
-		/// Maps the shared memory object.
-
-	void unmap();
-		/// Unmaps the shared memory object.
-
-	void close();
-		/// Releases the handle for the shared memory segment.
-
-	~SharedMemoryImpl();
-		/// Destroys the SharedMemoryImpl.
-
-private:
-	SharedMemoryImpl();
-	SharedMemoryImpl(const SharedMemoryImpl&);
-	SharedMemoryImpl& operator = (const SharedMemoryImpl&);
-
-	std::string _name;
-	HANDLE  _memHandle;
-	HANDLE  _fileHandle;
-	DWORD   _size;
-	DWORD   _mode;
-	char*   _address;
-};
-
-
-//
-// inlines
-//
-inline char* SharedMemoryImpl::begin() const
-{
-	return _address;
-}
-
-
-inline char* SharedMemoryImpl::end() const
-{
-	return _address + _size;
-}
-
-
-} // namespace Poco
-
-
-#endif // Foundation_SharedMemoryImpl_INCLUDED
+//
+// SharedMemoryImpl.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/SharedMemory_WIN32.h#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemoryImpl
+//
+// Definition of the SharedMemoryImpl class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_SharedMemoryImpl_INCLUDED
+#define Foundation_SharedMemoryImpl_INCLUDED
+
+
+#include "Poco/Poco.h"
+#include "Poco/SharedMemory.h"
+#include "Poco/RefCountedObject.h"
+
+
+namespace Poco {
+
+
+class Foundation_API SharedMemoryImpl: public RefCountedObject
+	/// Shared memory implementation for Windows platforms.
+{
+public:
+	SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void* addrHint, bool server);
+		/// Creates or connects to a shared memory object with the given name.
+		///
+		/// For maximum portability, name should be a valid Unix filename and not
+		/// contain any slashes or backslashes.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+
+	SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void* addrHint);
+		/// Maps the entire contents of file into a shared memory segment.
+		///
+		/// An address hint can be passed to the system, specifying the desired
+		/// start address of the shared memory area. Whether the hint
+		/// is actually honored is, however, up to the system. Windows platform
+		/// will generally ignore the hint.
+
+	char* begin() const;
+		/// Returns the beginn address of the SharedMemory segment. Will be null for illegal segments.
+
+	char* end() const;
+		/// Points past the last byte of the end address of the SharedMemory segment. Will be null for illegal segments.
+
+protected:
+	void map();
+		/// Maps the shared memory object.
+
+	void unmap();
+		/// Unmaps the shared memory object.
+
+	void close();
+		/// Releases the handle for the shared memory segment.
+
+	~SharedMemoryImpl();
+		/// Destroys the SharedMemoryImpl.
+
+private:
+	SharedMemoryImpl();
+	SharedMemoryImpl(const SharedMemoryImpl&);
+	SharedMemoryImpl& operator = (const SharedMemoryImpl&);
+
+	std::string _name;
+	HANDLE  _memHandle;
+	HANDLE  _fileHandle;
+	DWORD   _size;
+	DWORD   _mode;
+	char*   _address;
+};
+
+
+//
+// inlines
+//
+inline char* SharedMemoryImpl::begin() const
+{
+	return _address;
+}
+
+
+inline char* SharedMemoryImpl::end() const
+{
+	return _address + _size;
+}
+
+
+} // namespace Poco
+
+
+#endif // Foundation_SharedMemoryImpl_INCLUDED
diff --git a/Foundation/include/Poco/Tuple.h b/Foundation/include/Poco/Tuple.h
index 5db3b15d4..f0cef6fdf 100644
--- a/Foundation/include/Poco/Tuple.h
+++ b/Foundation/include/Poco/Tuple.h
@@ -1,1769 +1,1769 @@
-//
-// Tuple.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/Tuple.h#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  Tuple
-//
-// Definition of the Tuple class.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_Tuple_INCLUDED
-#define Foundation_Tuple_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/TypeList.h"
-
-
-namespace Poco {
-
-
-#if defined(POCO_OS_FAMILY_WINDOWS)
-#define POCO_TYPEWRAPPER_DEFAULTVALUE(T) TypeWrapper<T>::TYPE()
-#else
-#define POCO_TYPEWRAPPER_DEFAULTVALUE(T) typename TypeWrapper<T>::TYPE()
-#endif
-
-
-template <class T0,
-	class T1 = NullTypeList,
-	class T2 = NullTypeList,
-	class T3 = NullTypeList,
-	class T4 = NullTypeList,
-	class T5 = NullTypeList,
-	class T6 = NullTypeList,
-	class T7 = NullTypeList,
-	class T8 = NullTypeList,
-	class T9 = NullTypeList,
-	class T10 = NullTypeList,
-	class T11 = NullTypeList,
-	class T12 = NullTypeList,
-	class T13 = NullTypeList,
-	class T14 = NullTypeList,
-	class T15 = NullTypeList,
-	class T16 = NullTypeList,
-	class T17 = NullTypeList,
-	class T18 = NullTypeList,
-	class T19 = NullTypeList>
-struct Tuple
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
-		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t11, typename TypeListType<T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t12, typename TypeListType<T13,T14,T15,T16,T17,T18,T19>::HeadType
-			(t13, typename TypeListType<T14,T15,T16,T17,T18,T19>::HeadType
-			(t14, typename TypeListType<T15,T16,T17,T18,T19>::HeadType
-			(t15, typename TypeListType<T16,T17,T18,T19>::HeadType
-			(t16, typename TypeListType<T17,T18,T19>::HeadType
-			(t17, typename TypeListType<T18,T19>::HeadType
-			(t18, typename TypeListType<T19>::HeadType
-			(t19, NullTypeList()))))))))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12,
-	class T13,
-	class T14,
-	class T15,
-	class T16,
-	class T17,
-	class T18>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
-		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t11, typename TypeListType<T12,T13,T14,T15,T16,T17,T18>::HeadType
-			(t12, typename TypeListType<T13,T14,T15,T16,T17,T18>::HeadType
-			(t13, typename TypeListType<T14,T15,T16,T17,T18>::HeadType
-			(t14, typename TypeListType<T15,T16,T17,T18>::HeadType
-			(t15, typename TypeListType<T16,T17,T18>::HeadType
-			(t16, typename TypeListType<T17,T18>::HeadType
-			(t17, typename TypeListType<T18>::HeadType
-			(t18, NullTypeList())))))))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12,
-	class T13,
-	class T14,
-	class T15,
-	class T16,
-	class T17>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
-		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16,T17>::HeadType
-			(t11, typename TypeListType<T12,T13,T14,T15,T16,T17>::HeadType
-			(t12, typename TypeListType<T13,T14,T15,T16,T17>::HeadType
-			(t13, typename TypeListType<T14,T15,T16,T17>::HeadType
-			(t14, typename TypeListType<T15,T16,T17>::HeadType
-			(t15, typename TypeListType<T16,T17>::HeadType
-			(t16, typename TypeListType<T17>::HeadType
-			(t17, NullTypeList()))))))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12,
-	class T13,
-	class T14,
-	class T15,
-	class T16>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
-		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16>::HeadType
-			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16>::HeadType
-			(t11, typename TypeListType<T12,T13,T14,T15,T16>::HeadType
-			(t12, typename TypeListType<T13,T14,T15,T16>::HeadType
-			(t13, typename TypeListType<T14,T15,T16>::HeadType
-			(t14, typename TypeListType<T15,T16>::HeadType
-			(t15, typename TypeListType<T16>::HeadType
-			(t16, NullTypeList())))))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12,
-	class T13,
-	class T14,
-	class T15>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
-		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15>::HeadType
-			(t10, typename TypeListType<T11,T12,T13,T14,T15>::HeadType
-			(t11, typename TypeListType<T12,T13,T14,T15>::HeadType
-			(t12, typename TypeListType<T13,T14,T15>::HeadType
-			(t13, typename TypeListType<T14,T15>::HeadType
-			(t14, typename TypeListType<T15>::HeadType
-			(t15, NullTypeList()))))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12,
-	class T13,
-	class T14>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
-		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13,T14>::HeadType
-			(t10, typename TypeListType<T11,T12,T13,T14>::HeadType
-			(t11, typename TypeListType<T12,T13,T14>::HeadType
-			(t12, typename TypeListType<T13,T14>::HeadType
-			(t13, typename TypeListType<T14>::HeadType
-			(t14, NullTypeList())))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12,
-	class T13>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
-		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12,T13>::HeadType
-			(t9, typename TypeListType<T10,T11,T12,T13>::HeadType
-			(t10, typename TypeListType<T11,T12,T13>::HeadType
-			(t11, typename TypeListType<T12,T13>::HeadType
-			(t12, typename TypeListType<T13>::HeadType
-			(t13, NullTypeList()))))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11,
-	class T12>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
-		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11,T12>::HeadType
-			(t8, typename TypeListType<T9,T10,T11,T12>::HeadType
-			(t9, typename TypeListType<T10,T11,T12>::HeadType
-			(t10, typename TypeListType<T11,T12>::HeadType
-			(t11, typename TypeListType<T12>::HeadType
-			(t12, NullTypeList())))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10,
-	class T11>
-struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
-		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10,T11>::HeadType
-			(t7, typename TypeListType<T8,T9,T10,T11>::HeadType
-			(t8, typename TypeListType<T9,T10,T11>::HeadType
-			(t9, typename TypeListType<T10,T11>::HeadType
-			(t10, typename TypeListType<T11>::HeadType
-			(t11, NullTypeList()))))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9,
-	class T10>
-struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9,T10, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
-		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9,T10>::HeadType
-			(t6, typename TypeListType<T7,T8,T9,T10>::HeadType
-			(t7, typename TypeListType<T8,T9,T10>::HeadType
-			(t8, typename TypeListType<T9,T10>::HeadType
-			(t9, typename TypeListType<T10>::HeadType
-			(t10, NullTypeList())))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8,
-	class T9>
-struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9, NullTypeList>
-{
-	typedef typename TypeListType<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
-		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8,T9>::HeadType
-			(t5, typename TypeListType<T6,T7,T8,T9>::HeadType
-			(t6, typename TypeListType<T7,T8,T9>::HeadType
-			(t7, typename TypeListType<T8,T9>::HeadType
-			(t8, typename TypeListType<T9>::HeadType
-			(t9, NullTypeList()))))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7,
-	class T8>
-struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
-		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7,T8>::HeadType
-			(t4, typename TypeListType<T5,T6,T7,T8>::HeadType
-			(t5, typename TypeListType<T6,T7,T8>::HeadType
-			(t6, typename TypeListType<T7,T8>::HeadType
-			(t7, typename TypeListType<T8>::HeadType
-			(t8, NullTypeList())))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6,
-	class T7>
-struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
-		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6,T7>::HeadType
-			(t3, typename TypeListType<T4,T5,T6,T7>::HeadType
-			(t4, typename TypeListType<T5,T6,T7>::HeadType
-			(t5, typename TypeListType<T6,T7>::HeadType
-			(t6, typename TypeListType<T7>::HeadType
-			(t7, NullTypeList()))))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5,
-	class T6>
-struct Tuple<T0, T1,T2,T3,T4,T5,T6, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
-		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5,T6>::HeadType
-			(t2, typename TypeListType<T3,T4,T5,T6>::HeadType
-			(t3, typename TypeListType<T4,T5,T6>::HeadType
-			(t4, typename TypeListType<T5,T6>::HeadType
-			(t5, typename TypeListType<T6>::HeadType
-			(t6, NullTypeList())))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4,
-	class T5>
-struct Tuple<T0, T1,T2,T3,T4,T5, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4,T5>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
-		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4,T5>::HeadType
-			(t1, typename TypeListType<T2,T3,T4,T5>::HeadType
-			(t2, typename TypeListType<T3,T4,T5>::HeadType
-			(t3, typename TypeListType<T4,T5>::HeadType
-			(t4, typename TypeListType<T5>::HeadType
-			(t5, NullTypeList()))))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3,
-	class T4>
-struct Tuple<T0, T1,T2,T3,T4, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3,T4>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
-		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)):
-		_data(t0, typename TypeListType<T1,T2,T3,T4>::HeadType
-			(t1, typename TypeListType<T2,T3,T4>::HeadType
-			(t2, typename TypeListType<T3,T4>::HeadType
-			(t3, typename TypeListType<T4>::HeadType
-			(t4, NullTypeList())))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2,
-	class T3>
-struct Tuple<T0, T1,T2,T3, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2,T3>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
-		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)):
-		_data(t0, typename TypeListType<T1,T2,T3>::HeadType
-			(t1, typename TypeListType<T2,T3>::HeadType
-			(t2, typename TypeListType<T3>::HeadType
-			(t3, NullTypeList()))))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1,
-	class T2>
-struct Tuple<T0, T1,T2, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1,T2>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
-		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)):
-		_data(t0, typename TypeListType<T1,T2>::HeadType
-			(t1, typename TypeListType<T2>::HeadType
-			(t2, NullTypeList())))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0,
-	class T1>
-struct Tuple<T0, T1, NullTypeList>
-{
-	typedef typename TypeListType<T0,T1>::HeadType Type;
-
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
-		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)):
-		_data(t0, typename TypeListType<T1>::HeadType(t1, NullTypeList()))
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-template <class T0>
-struct Tuple<T0, NullTypeList>
-{
-	typedef TypeList<T0, NullTypeList> Type;
-	
-	enum TupleLengthType
-	{
-		length = Type::length
-	};
-
-	Tuple():_data()
-	{
-	}
-
-	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0):
-		_data(t0, NullTypeList())
-	{
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::ConstHeadType& get() const
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	typename TypeGetter<N, Type>::HeadType& get()
-	{
-		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
-	}
-
-	template <int N>
-	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
-	{
-		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
-	}
-
-	bool operator == (const Tuple& other) const
-	{
-		return _data == other._data;
-	}
-
-	bool operator != (const Tuple& other) const
-	{
-		return !(_data == other._data);
-	}
-
-	bool operator < (const Tuple& other) const
-	{
-		return _data < other._data;
-	}
-
-private:
-	Type _data;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Tuple_INCLUDED
+//
+// Tuple.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/Tuple.h#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  Tuple
+//
+// Definition of the Tuple class.
+//
+// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_Tuple_INCLUDED
+#define Foundation_Tuple_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/TypeList.h"
+
+
+namespace Poco {
+
+
+#if defined(POCO_OS_FAMILY_WINDOWS)
+#define POCO_TYPEWRAPPER_DEFAULTVALUE(T) TypeWrapper<T>::TYPE()
+#else
+#define POCO_TYPEWRAPPER_DEFAULTVALUE(T) typename TypeWrapper<T>::TYPE()
+#endif
+
+
+template <class T0,
+	class T1 = NullTypeList,
+	class T2 = NullTypeList,
+	class T3 = NullTypeList,
+	class T4 = NullTypeList,
+	class T5 = NullTypeList,
+	class T6 = NullTypeList,
+	class T7 = NullTypeList,
+	class T8 = NullTypeList,
+	class T9 = NullTypeList,
+	class T10 = NullTypeList,
+	class T11 = NullTypeList,
+	class T12 = NullTypeList,
+	class T13 = NullTypeList,
+	class T14 = NullTypeList,
+	class T15 = NullTypeList,
+	class T16 = NullTypeList,
+	class T17 = NullTypeList,
+	class T18 = NullTypeList,
+	class T19 = NullTypeList>
+struct Tuple
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0,
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18),
+		typename TypeWrapper<T19>::CONSTTYPE& t19 = POCO_TYPEWRAPPER_DEFAULTVALUE(T19)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t11, typename TypeListType<T12,T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t12, typename TypeListType<T13,T14,T15,T16,T17,T18,T19>::HeadType
+			(t13, typename TypeListType<T14,T15,T16,T17,T18,T19>::HeadType
+			(t14, typename TypeListType<T15,T16,T17,T18,T19>::HeadType
+			(t15, typename TypeListType<T16,T17,T18,T19>::HeadType
+			(t16, typename TypeListType<T17,T18,T19>::HeadType
+			(t17, typename TypeListType<T18,T19>::HeadType
+			(t18, typename TypeListType<T19>::HeadType
+			(t19, NullTypeList()))))))))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17,
+	class T18>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17),
+		typename TypeWrapper<T18>::CONSTTYPE& t18 = POCO_TYPEWRAPPER_DEFAULTVALUE(T18)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t11, typename TypeListType<T12,T13,T14,T15,T16,T17,T18>::HeadType
+			(t12, typename TypeListType<T13,T14,T15,T16,T17,T18>::HeadType
+			(t13, typename TypeListType<T14,T15,T16,T17,T18>::HeadType
+			(t14, typename TypeListType<T15,T16,T17,T18>::HeadType
+			(t15, typename TypeListType<T16,T17,T18>::HeadType
+			(t16, typename TypeListType<T17,T18>::HeadType
+			(t17, typename TypeListType<T18>::HeadType
+			(t18, NullTypeList())))))))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16,
+	class T17>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16),
+		typename TypeWrapper<T17>::CONSTTYPE& t17 = POCO_TYPEWRAPPER_DEFAULTVALUE(T17)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16,T17>::HeadType
+			(t11, typename TypeListType<T12,T13,T14,T15,T16,T17>::HeadType
+			(t12, typename TypeListType<T13,T14,T15,T16,T17>::HeadType
+			(t13, typename TypeListType<T14,T15,T16,T17>::HeadType
+			(t14, typename TypeListType<T15,T16,T17>::HeadType
+			(t15, typename TypeListType<T16,T17>::HeadType
+			(t16, typename TypeListType<T17>::HeadType
+			(t17, NullTypeList()))))))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15,
+	class T16>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15),
+		typename TypeWrapper<T16>::CONSTTYPE& t16 = POCO_TYPEWRAPPER_DEFAULTVALUE(T16)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15,T16>::HeadType
+			(t10, typename TypeListType<T11,T12,T13,T14,T15,T16>::HeadType
+			(t11, typename TypeListType<T12,T13,T14,T15,T16>::HeadType
+			(t12, typename TypeListType<T13,T14,T15,T16>::HeadType
+			(t13, typename TypeListType<T14,T15,T16>::HeadType
+			(t14, typename TypeListType<T15,T16>::HeadType
+			(t15, typename TypeListType<T16>::HeadType
+			(t16, NullTypeList())))))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14,
+	class T15>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14),
+		typename TypeWrapper<T15>::CONSTTYPE& t15 = POCO_TYPEWRAPPER_DEFAULTVALUE(T15)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14,T15>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13,T14,T15>::HeadType
+			(t10, typename TypeListType<T11,T12,T13,T14,T15>::HeadType
+			(t11, typename TypeListType<T12,T13,T14,T15>::HeadType
+			(t12, typename TypeListType<T13,T14,T15>::HeadType
+			(t13, typename TypeListType<T14,T15>::HeadType
+			(t14, typename TypeListType<T15>::HeadType
+			(t15, NullTypeList()))))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13,
+	class T14>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13),
+		typename TypeWrapper<T14>::CONSTTYPE& t14 = POCO_TYPEWRAPPER_DEFAULTVALUE(T14)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13,T14>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13,T14>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13,T14>::HeadType
+			(t10, typename TypeListType<T11,T12,T13,T14>::HeadType
+			(t11, typename TypeListType<T12,T13,T14>::HeadType
+			(t12, typename TypeListType<T13,T14>::HeadType
+			(t13, typename TypeListType<T14>::HeadType
+			(t14, NullTypeList())))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12,
+	class T13>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12),
+		typename TypeWrapper<T13>::CONSTTYPE& t13 = POCO_TYPEWRAPPER_DEFAULTVALUE(T13)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12,T13>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12,T13>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12,T13>::HeadType
+			(t9, typename TypeListType<T10,T11,T12,T13>::HeadType
+			(t10, typename TypeListType<T11,T12,T13>::HeadType
+			(t11, typename TypeListType<T12,T13>::HeadType
+			(t12, typename TypeListType<T13>::HeadType
+			(t13, NullTypeList()))))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11,
+	class T12>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11),
+		typename TypeWrapper<T12>::CONSTTYPE& t12 = POCO_TYPEWRAPPER_DEFAULTVALUE(T12)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11,T12>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11,T12>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11,T12>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11,T12>::HeadType
+			(t8, typename TypeListType<T9,T10,T11,T12>::HeadType
+			(t9, typename TypeListType<T10,T11,T12>::HeadType
+			(t10, typename TypeListType<T11,T12>::HeadType
+			(t11, typename TypeListType<T12>::HeadType
+			(t12, NullTypeList())))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10,
+	class T11>
+struct Tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10),
+		typename TypeWrapper<T11>::CONSTTYPE& t11 = POCO_TYPEWRAPPER_DEFAULTVALUE(T11)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10,T11>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10,T11>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10,T11>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10,T11>::HeadType
+			(t7, typename TypeListType<T8,T9,T10,T11>::HeadType
+			(t8, typename TypeListType<T9,T10,T11>::HeadType
+			(t9, typename TypeListType<T10,T11>::HeadType
+			(t10, typename TypeListType<T11>::HeadType
+			(t11, NullTypeList()))))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9,
+	class T10>
+struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9,T10, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9),
+		typename TypeWrapper<T10>::CONSTTYPE& t10 = POCO_TYPEWRAPPER_DEFAULTVALUE(T10)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9,T10>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9,T10>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9,T10>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9,T10>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9,T10>::HeadType
+			(t6, typename TypeListType<T7,T8,T9,T10>::HeadType
+			(t7, typename TypeListType<T8,T9,T10>::HeadType
+			(t8, typename TypeListType<T9,T10>::HeadType
+			(t9, typename TypeListType<T10>::HeadType
+			(t10, NullTypeList())))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8,
+	class T9>
+struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9, NullTypeList>
+{
+	typedef typename TypeListType<T0, T1,T2,T3,T4,T5,T6,T7,T8,T9>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8),
+		typename TypeWrapper<T9>::CONSTTYPE& t9 = POCO_TYPEWRAPPER_DEFAULTVALUE(T9)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8,T9>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8,T9>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8,T9>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8,T9>::HeadType
+			(t5, typename TypeListType<T6,T7,T8,T9>::HeadType
+			(t6, typename TypeListType<T7,T8,T9>::HeadType
+			(t7, typename TypeListType<T8,T9>::HeadType
+			(t8, typename TypeListType<T9>::HeadType
+			(t9, NullTypeList()))))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7,
+	class T8>
+struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7,T8, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7,T8>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7),
+		typename TypeWrapper<T8>::CONSTTYPE& t8 = POCO_TYPEWRAPPER_DEFAULTVALUE(T8)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7,T8>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7,T8>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7,T8>::HeadType
+			(t4, typename TypeListType<T5,T6,T7,T8>::HeadType
+			(t5, typename TypeListType<T6,T7,T8>::HeadType
+			(t6, typename TypeListType<T7,T8>::HeadType
+			(t7, typename TypeListType<T8>::HeadType
+			(t8, NullTypeList())))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6,
+	class T7>
+struct Tuple<T0, T1,T2,T3,T4,T5,T6,T7, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6,T7>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6),
+		typename TypeWrapper<T7>::CONSTTYPE& t7 = POCO_TYPEWRAPPER_DEFAULTVALUE(T7)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6,T7>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6,T7>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6,T7>::HeadType
+			(t3, typename TypeListType<T4,T5,T6,T7>::HeadType
+			(t4, typename TypeListType<T5,T6,T7>::HeadType
+			(t5, typename TypeListType<T6,T7>::HeadType
+			(t6, typename TypeListType<T7>::HeadType
+			(t7, NullTypeList()))))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5,
+	class T6>
+struct Tuple<T0, T1,T2,T3,T4,T5,T6, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5,T6>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5),
+		typename TypeWrapper<T6>::CONSTTYPE& t6 = POCO_TYPEWRAPPER_DEFAULTVALUE(T6)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5,T6>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5,T6>::HeadType
+			(t2, typename TypeListType<T3,T4,T5,T6>::HeadType
+			(t3, typename TypeListType<T4,T5,T6>::HeadType
+			(t4, typename TypeListType<T5,T6>::HeadType
+			(t5, typename TypeListType<T6>::HeadType
+			(t6, NullTypeList())))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4,
+	class T5>
+struct Tuple<T0, T1,T2,T3,T4,T5, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4,T5>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4),
+		typename TypeWrapper<T5>::CONSTTYPE& t5 = POCO_TYPEWRAPPER_DEFAULTVALUE(T5)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4,T5>::HeadType
+			(t1, typename TypeListType<T2,T3,T4,T5>::HeadType
+			(t2, typename TypeListType<T3,T4,T5>::HeadType
+			(t3, typename TypeListType<T4,T5>::HeadType
+			(t4, typename TypeListType<T5>::HeadType
+			(t5, NullTypeList()))))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3,
+	class T4>
+struct Tuple<T0, T1,T2,T3,T4, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3,T4>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3),
+		typename TypeWrapper<T4>::CONSTTYPE& t4 = POCO_TYPEWRAPPER_DEFAULTVALUE(T4)):
+		_data(t0, typename TypeListType<T1,T2,T3,T4>::HeadType
+			(t1, typename TypeListType<T2,T3,T4>::HeadType
+			(t2, typename TypeListType<T3,T4>::HeadType
+			(t3, typename TypeListType<T4>::HeadType
+			(t4, NullTypeList())))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2,
+	class T3>
+struct Tuple<T0, T1,T2,T3, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2,T3>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2),
+		typename TypeWrapper<T3>::CONSTTYPE& t3 = POCO_TYPEWRAPPER_DEFAULTVALUE(T3)):
+		_data(t0, typename TypeListType<T1,T2,T3>::HeadType
+			(t1, typename TypeListType<T2,T3>::HeadType
+			(t2, typename TypeListType<T3>::HeadType
+			(t3, NullTypeList()))))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1,
+	class T2>
+struct Tuple<T0, T1,T2, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1,T2>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1),
+		typename TypeWrapper<T2>::CONSTTYPE& t2 = POCO_TYPEWRAPPER_DEFAULTVALUE(T2)):
+		_data(t0, typename TypeListType<T1,T2>::HeadType
+			(t1, typename TypeListType<T2>::HeadType
+			(t2, NullTypeList())))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0,
+	class T1>
+struct Tuple<T0, T1, NullTypeList>
+{
+	typedef typename TypeListType<T0,T1>::HeadType Type;
+
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0, 
+		typename TypeWrapper<T1>::CONSTTYPE& t1 = POCO_TYPEWRAPPER_DEFAULTVALUE(T1)):
+		_data(t0, typename TypeListType<T1>::HeadType(t1, NullTypeList()))
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+template <class T0>
+struct Tuple<T0, NullTypeList>
+{
+	typedef TypeList<T0, NullTypeList> Type;
+	
+	enum TupleLengthType
+	{
+		length = Type::length
+	};
+
+	Tuple():_data()
+	{
+	}
+
+	Tuple(typename TypeWrapper<T0>::CONSTTYPE& t0):
+		_data(t0, NullTypeList())
+	{
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::ConstHeadType& get() const
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	typename TypeGetter<N, Type>::HeadType& get()
+	{
+		return Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data);
+	}
+
+	template <int N>
+	void set(typename TypeGetter<N, Type>::ConstHeadType& val)
+	{
+		Getter<N>::template get<typename TypeGetter<N, Type>::HeadType, typename Type::HeadType, typename Type::TailType>(_data) = val;
+	}
+
+	bool operator == (const Tuple& other) const
+	{
+		return _data == other._data;
+	}
+
+	bool operator != (const Tuple& other) const
+	{
+		return !(_data == other._data);
+	}
+
+	bool operator < (const Tuple& other) const
+	{
+		return _data < other._data;
+	}
+
+private:
+	Type _data;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_Tuple_INCLUDED
diff --git a/Foundation/include/Poco/TypeList.h b/Foundation/include/Poco/TypeList.h
index 0900d445f..bc09fcc52 100644
--- a/Foundation/include/Poco/TypeList.h
+++ b/Foundation/include/Poco/TypeList.h
@@ -1,487 +1,487 @@
-//
-// TypeList.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/TypeList.h#3 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  TypeList
-//
-// Implementation of the TypeList template.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Portions extracted and adapted from
-// The Loki Library
-// Copyright (c) 2001 by Andrei Alexandrescu
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_TypeList_INCLUDED
-#define  Foundation_TypeList_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/MetaProgramming.h"
-
-
-namespace Poco {
-
-
-template <class Head, class Tail> 
-struct TypeList;
-
-	
-struct NullTypeList
-{
-	enum
-	{
-		length = 0
-	};
-
-	bool operator == (const NullTypeList&) const
-	{
-		return true;
-	}
-
-	bool operator != (const NullTypeList&) const
-	{
-		return false;
-	}
-
-	bool operator < (const NullTypeList&) const
-	{
-		return false;
-	}
-};
-
-
-template <class Head, class Tail> 
-struct TypeList
-	/// Compile Time List of Types
-{
-	typedef Head HeadType;
-	typedef Tail TailType;
-	typedef typename TypeWrapper<HeadType>::CONSTTYPE ConstHeadType;
-	typedef typename TypeWrapper<TailType>::CONSTTYPE ConstTailType;
-	enum
-	{
-		length = TailType::length+1
-	};
-
-	TypeList():head(), tail()
-	{
-	}
-
-	TypeList(ConstHeadType& h, ConstTailType& t):head(h), tail(t)
-	{
-	}
-
-	TypeList(const TypeList& tl): head(tl.head), tail(tl.tail)
-	{
-	}
-
-	TypeList& operator = (const TypeList& tl)
-	{
-		if (this != &tl)
-		{
-			TypeList tmp(tl);
-			swap(tmp);
-		}
-		return *this;
-	}
-
-	bool operator == (const TypeList& tl) const
-	{
-		return tl.head == head && tl.tail == tail;
-	}
-
-	bool operator != (const TypeList& tl) const
-	{
-		return !(*this == tl);
-	}
-
-	bool operator < (const TypeList& tl) const
-	{
-		if (head < tl.head)
-			return true;
-		else if (head == tl.head)
-			return tail < tl.tail;
-		return false;
-	}
-
-	void swap(TypeList& tl)
-	{
-		std::swap(head, tl.head);
-		std::swap(tail, tl.tail);
-	}
-	
-	HeadType head;
-	TailType tail;
-};
-
-
-template <typename T0  = NullTypeList, 
-	typename T1  = NullTypeList, 
-	typename T2  = NullTypeList,
-	typename T3  = NullTypeList, 
-	typename T4  = NullTypeList, 
-	typename T5  = NullTypeList,
-	typename T6  = NullTypeList, 
-	typename T7  = NullTypeList, 
-	typename T8  = NullTypeList,
-	typename T9  = NullTypeList, 
-	typename T10 = NullTypeList, 
-	typename T11 = NullTypeList,
-	typename T12 = NullTypeList, 
-	typename T13 = NullTypeList, 
-	typename T14 = NullTypeList,
-	typename T15 = NullTypeList, 
-	typename T16 = NullTypeList, 
-	typename T17 = NullTypeList,
-	typename T18 = NullTypeList,
-	typename T19 = NullTypeList> 
-struct TypeListType
-	/// TypeListType takes 1 - 20 typename arguments.
-	/// Usage:
-	///
-	/// TypeListType<T0, T1, ... , Tn>::HeadType typeList;
-	///
-	/// typeList is a TypeList of T0, T1, ... , Tn
-{
-private:
-    typedef typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType TailType;
-
-public:
-    typedef TypeList<T0, TailType> HeadType;
-};
-
-
-template <>
-struct TypeListType<>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <int n> 
-struct Getter
-{
-	template <class Ret, class Head, class Tail>
-	inline static Ret& get(TypeList<Head, Tail>& val)
-	{
-		return Getter<n-1>::template get<Ret, typename Tail::HeadType, typename Tail::TailType>(val.tail);
-	}
-
-	template <class Ret, class Head, class Tail>
-	inline static const Ret& get(const TypeList<Head, Tail>& val)
-	{
-		return Getter<n-1>::template get<Ret, typename Tail::HeadType, typename Tail::TailType>(val.tail);
-	}
-};
-
-
-template <> 
-struct Getter<0>
-{
-	template <class Ret, class Head, class Tail>
-	inline static Ret& get(TypeList<Head, Tail>& val)
-	{
-		return val.head;
-	}
-
-	template <class Ret, class Head, class Tail>
-	inline static const Ret& get(const TypeList<Head, Tail>& val)
-	{
-		return val.head;
-	}
-};
-
-
-template <int N, class Head> 
-struct TypeGetter;
-
-
-template <int N, class Head, class Tail> 
-struct TypeGetter<N, TypeList<Head, Tail> >
-{
-	typedef typename TypeGetter<N-1, Tail>::HeadType HeadType;
-	typedef typename TypeWrapper<HeadType>::CONSTTYPE ConstHeadType;
-};
-
-
-template <class Head, class Tail> 
-struct TypeGetter<0, TypeList<Head, Tail> >
-{
-	typedef typename TypeList<Head, Tail>::HeadType HeadType;
-	typedef typename TypeWrapper<HeadType>::CONSTTYPE ConstHeadType;
-};
-
-
-template <class Head, class T>
-struct TypeLocator;
-	/// TypeLocator returns the first occurrence of the type T in Head
-	/// or -1 if the type is not found.
-	///
-	/// Usage example:
-	///
-	/// TypeLocator<Head, int>::HeadType TypeLoc;
-	///
-	/// if (2 == TypeLoc.value) ...
-	///
-	
-
-template <class T>
-struct TypeLocator<NullTypeList, T>
-{
-	enum { value = -1 };
-};
-
-
-template <class T, class Tail>
-struct TypeLocator<TypeList<T, Tail>, T>
-{
-	enum { value = 0 };
-};
-
-
-template <class Head, class Tail, class T>
-struct TypeLocator<TypeList<Head, Tail>, T>
-{
-private:
-	enum { tmp = TypeLocator<Tail, T>::value };
-public:
-	enum { value = tmp == -1 ? -1 : 1 + tmp };
-};
-
-
-template <class Head, class T> 
-struct TypeAppender;
-	/// TypeAppender appends T (type or a TypeList) to Head.
-	///
-	/// Usage:
-	///
-	/// typedef TypeListType<char>::HeadType Type1;
-	/// typedef TypeAppender<Type1, int>::HeadType Type2;
-	/// (Type2 is a TypeList of char,int)
-	///
-	///	typedef TypeListType<float, double>::HeadType Type3;
-	/// typedef TypeAppender<Type2, Type3>::HeadType Type4;
-	/// (Type4 is a TypeList of char,int,float,double)
-	///
-
-
-template <>
-struct TypeAppender<NullTypeList, NullTypeList>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <class T>
-struct TypeAppender<NullTypeList, T>
-{
-	typedef TypeList<T, NullTypeList> HeadType;
-};
-
-
-template <class Head, class Tail>
-struct TypeAppender<NullTypeList, TypeList<Head, Tail> >
-{
-	typedef TypeList<Head, Tail> HeadType;
-};
-
-
-template <class Head, class Tail, class T>
-struct TypeAppender<TypeList<Head, Tail>, T>
-{
-	typedef TypeList<Head, typename TypeAppender<Tail, T>::HeadType> HeadType;
-};
-
-
-template <class Head, class T> 
-struct TypeOneEraser;
-	/// TypeOneEraser erases the first occurence of the type T in Head.
-	/// Usage:
-	///
-	/// typedef TypeListType<char, int, float>::HeadType Type3;
-	/// typedef TypeOneEraser<Type3, int>::HeadType Type2;
-	/// (Type2 is a TypeList of char,float)
-	///
-
-
-template <class T>
-struct TypeOneEraser<NullTypeList, T>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <class T, class Tail>
-struct TypeOneEraser<TypeList<T, Tail>, T>
-{
-	typedef Tail HeadType;
-};
-
-
-template <class Head, class Tail, class T>
-struct TypeOneEraser<TypeList<Head, Tail>, T>
-{
-	typedef TypeList <Head, typename TypeOneEraser<Tail, T>::HeadType> HeadType;
-};
-
-
-template <class Head, class T> 
-struct TypeAllEraser;
-	/// TypeAllEraser erases all the occurences of the type T in Head.
-	/// Usage:
-	///
-	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
-	/// typedef TypeAllEraser<Type4, int>::HeadType Type2;
-	/// (Type2 is a TypeList of char,float)
-	///
-
-
-template <class T>
-struct TypeAllEraser<NullTypeList, T>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <class T, class Tail>
-struct TypeAllEraser<TypeList<T, Tail>, T>
-{
-	typedef typename TypeAllEraser<Tail, T>::HeadType HeadType;
-};
-
-
-template <class Head, class Tail, class T>
-struct TypeAllEraser<TypeList<Head, Tail>, T>
-{
-	typedef TypeList <Head, typename TypeAllEraser<Tail, T>::HeadType> HeadType;
-};
-
-
-template <class Head> 
-struct TypeDuplicateEraser;
-	/// TypeDuplicateEraser erases all but the first occurence of the type T in Head.
-	/// Usage:
-	///
-	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
-	/// typedef TypeDuplicateEraser<Type4, int>::HeadType Type3;
-	/// (Type3 is a TypeList of char,int,float)
-	///
-
-
-template <> 
-struct TypeDuplicateEraser<NullTypeList>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <class Head, class Tail>
-struct TypeDuplicateEraser<TypeList<Head, Tail> >
-{
-private:
-	typedef typename TypeDuplicateEraser<Tail>::HeadType L1;
-	typedef typename TypeOneEraser<L1, Head>::HeadType L2;
-public:
-	typedef TypeList<Head, L2> HeadType;
-};
-
-
-template <class Head, class T, class R>
-struct TypeOneReplacer;
-	/// TypeOneReplacer replaces the first occurence 
-	/// of the type T in Head with type R.
-	/// Usage:
-	///
-	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
-	/// typedef TypeOneReplacer<Type4, int, double>::HeadType TypeR;
-	/// (TypeR is a TypeList of char,double,float,int)
-	///
-
-
-template <class T, class R>
-struct TypeOneReplacer<NullTypeList, T, R>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <class T, class Tail, class R>
-struct TypeOneReplacer<TypeList<T, Tail>, T, R>
-{
-	typedef TypeList<R, Tail> HeadType;
-};
-
-
-template <class Head, class Tail, class T, class R>
-struct TypeOneReplacer<TypeList<Head, Tail>, T, R>
-{
-	typedef TypeList<Head, typename TypeOneReplacer<Tail, T, R>::HeadType> HeadType;
-};
-
-
-template <class Head, class T, class R>
-struct TypeAllReplacer;
-	/// TypeAllReplacer replaces all the occurences 
-	/// of the type T in Head with type R.
-	/// Usage:
-	///
-	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
-	/// typedef TypeAllReplacer<Type4, int, double>::HeadType TypeR;
-	/// (TypeR is a TypeList of char,double,float,double)
-	///
-
-
-template <class T, class R>
-struct TypeAllReplacer<NullTypeList, T, R>
-{
-	typedef NullTypeList HeadType;
-};
-
-
-template <class T, class Tail, class R>
-struct TypeAllReplacer<TypeList<T, Tail>, T, R>
-{
-	typedef TypeList<R, typename TypeAllReplacer<Tail, T, R>::HeadType> HeadType;
-};
-
-
-template <class Head, class Tail, class T, class R>
-struct TypeAllReplacer<TypeList<Head, Tail>, T, R>
-{
-	typedef TypeList<Head, typename TypeAllReplacer<Tail, T, R>::HeadType> HeadType;
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// TypeList.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/TypeList.h#3 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  TypeList
+//
+// Implementation of the TypeList template.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Portions extracted and adapted from
+// The Loki Library
+// Copyright (c) 2001 by Andrei Alexandrescu
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_TypeList_INCLUDED
+#define  Foundation_TypeList_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/MetaProgramming.h"
+
+
+namespace Poco {
+
+
+template <class Head, class Tail> 
+struct TypeList;
+
+	
+struct NullTypeList
+{
+	enum
+	{
+		length = 0
+	};
+
+	bool operator == (const NullTypeList&) const
+	{
+		return true;
+	}
+
+	bool operator != (const NullTypeList&) const
+	{
+		return false;
+	}
+
+	bool operator < (const NullTypeList&) const
+	{
+		return false;
+	}
+};
+
+
+template <class Head, class Tail> 
+struct TypeList
+	/// Compile Time List of Types
+{
+	typedef Head HeadType;
+	typedef Tail TailType;
+	typedef typename TypeWrapper<HeadType>::CONSTTYPE ConstHeadType;
+	typedef typename TypeWrapper<TailType>::CONSTTYPE ConstTailType;
+	enum
+	{
+		length = TailType::length+1
+	};
+
+	TypeList():head(), tail()
+	{
+	}
+
+	TypeList(ConstHeadType& h, ConstTailType& t):head(h), tail(t)
+	{
+	}
+
+	TypeList(const TypeList& tl): head(tl.head), tail(tl.tail)
+	{
+	}
+
+	TypeList& operator = (const TypeList& tl)
+	{
+		if (this != &tl)
+		{
+			TypeList tmp(tl);
+			swap(tmp);
+		}
+		return *this;
+	}
+
+	bool operator == (const TypeList& tl) const
+	{
+		return tl.head == head && tl.tail == tail;
+	}
+
+	bool operator != (const TypeList& tl) const
+	{
+		return !(*this == tl);
+	}
+
+	bool operator < (const TypeList& tl) const
+	{
+		if (head < tl.head)
+			return true;
+		else if (head == tl.head)
+			return tail < tl.tail;
+		return false;
+	}
+
+	void swap(TypeList& tl)
+	{
+		std::swap(head, tl.head);
+		std::swap(tail, tl.tail);
+	}
+	
+	HeadType head;
+	TailType tail;
+};
+
+
+template <typename T0  = NullTypeList, 
+	typename T1  = NullTypeList, 
+	typename T2  = NullTypeList,
+	typename T3  = NullTypeList, 
+	typename T4  = NullTypeList, 
+	typename T5  = NullTypeList,
+	typename T6  = NullTypeList, 
+	typename T7  = NullTypeList, 
+	typename T8  = NullTypeList,
+	typename T9  = NullTypeList, 
+	typename T10 = NullTypeList, 
+	typename T11 = NullTypeList,
+	typename T12 = NullTypeList, 
+	typename T13 = NullTypeList, 
+	typename T14 = NullTypeList,
+	typename T15 = NullTypeList, 
+	typename T16 = NullTypeList, 
+	typename T17 = NullTypeList,
+	typename T18 = NullTypeList,
+	typename T19 = NullTypeList> 
+struct TypeListType
+	/// TypeListType takes 1 - 20 typename arguments.
+	/// Usage:
+	///
+	/// TypeListType<T0, T1, ... , Tn>::HeadType typeList;
+	///
+	/// typeList is a TypeList of T0, T1, ... , Tn
+{
+private:
+    typedef typename TypeListType<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19>::HeadType TailType;
+
+public:
+    typedef TypeList<T0, TailType> HeadType;
+};
+
+
+template <>
+struct TypeListType<>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <int n> 
+struct Getter
+{
+	template <class Ret, class Head, class Tail>
+	inline static Ret& get(TypeList<Head, Tail>& val)
+	{
+		return Getter<n-1>::template get<Ret, typename Tail::HeadType, typename Tail::TailType>(val.tail);
+	}
+
+	template <class Ret, class Head, class Tail>
+	inline static const Ret& get(const TypeList<Head, Tail>& val)
+	{
+		return Getter<n-1>::template get<Ret, typename Tail::HeadType, typename Tail::TailType>(val.tail);
+	}
+};
+
+
+template <> 
+struct Getter<0>
+{
+	template <class Ret, class Head, class Tail>
+	inline static Ret& get(TypeList<Head, Tail>& val)
+	{
+		return val.head;
+	}
+
+	template <class Ret, class Head, class Tail>
+	inline static const Ret& get(const TypeList<Head, Tail>& val)
+	{
+		return val.head;
+	}
+};
+
+
+template <int N, class Head> 
+struct TypeGetter;
+
+
+template <int N, class Head, class Tail> 
+struct TypeGetter<N, TypeList<Head, Tail> >
+{
+	typedef typename TypeGetter<N-1, Tail>::HeadType HeadType;
+	typedef typename TypeWrapper<HeadType>::CONSTTYPE ConstHeadType;
+};
+
+
+template <class Head, class Tail> 
+struct TypeGetter<0, TypeList<Head, Tail> >
+{
+	typedef typename TypeList<Head, Tail>::HeadType HeadType;
+	typedef typename TypeWrapper<HeadType>::CONSTTYPE ConstHeadType;
+};
+
+
+template <class Head, class T>
+struct TypeLocator;
+	/// TypeLocator returns the first occurrence of the type T in Head
+	/// or -1 if the type is not found.
+	///
+	/// Usage example:
+	///
+	/// TypeLocator<Head, int>::HeadType TypeLoc;
+	///
+	/// if (2 == TypeLoc.value) ...
+	///
+	
+
+template <class T>
+struct TypeLocator<NullTypeList, T>
+{
+	enum { value = -1 };
+};
+
+
+template <class T, class Tail>
+struct TypeLocator<TypeList<T, Tail>, T>
+{
+	enum { value = 0 };
+};
+
+
+template <class Head, class Tail, class T>
+struct TypeLocator<TypeList<Head, Tail>, T>
+{
+private:
+	enum { tmp = TypeLocator<Tail, T>::value };
+public:
+	enum { value = tmp == -1 ? -1 : 1 + tmp };
+};
+
+
+template <class Head, class T> 
+struct TypeAppender;
+	/// TypeAppender appends T (type or a TypeList) to Head.
+	///
+	/// Usage:
+	///
+	/// typedef TypeListType<char>::HeadType Type1;
+	/// typedef TypeAppender<Type1, int>::HeadType Type2;
+	/// (Type2 is a TypeList of char,int)
+	///
+	///	typedef TypeListType<float, double>::HeadType Type3;
+	/// typedef TypeAppender<Type2, Type3>::HeadType Type4;
+	/// (Type4 is a TypeList of char,int,float,double)
+	///
+
+
+template <>
+struct TypeAppender<NullTypeList, NullTypeList>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <class T>
+struct TypeAppender<NullTypeList, T>
+{
+	typedef TypeList<T, NullTypeList> HeadType;
+};
+
+
+template <class Head, class Tail>
+struct TypeAppender<NullTypeList, TypeList<Head, Tail> >
+{
+	typedef TypeList<Head, Tail> HeadType;
+};
+
+
+template <class Head, class Tail, class T>
+struct TypeAppender<TypeList<Head, Tail>, T>
+{
+	typedef TypeList<Head, typename TypeAppender<Tail, T>::HeadType> HeadType;
+};
+
+
+template <class Head, class T> 
+struct TypeOneEraser;
+	/// TypeOneEraser erases the first occurence of the type T in Head.
+	/// Usage:
+	///
+	/// typedef TypeListType<char, int, float>::HeadType Type3;
+	/// typedef TypeOneEraser<Type3, int>::HeadType Type2;
+	/// (Type2 is a TypeList of char,float)
+	///
+
+
+template <class T>
+struct TypeOneEraser<NullTypeList, T>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <class T, class Tail>
+struct TypeOneEraser<TypeList<T, Tail>, T>
+{
+	typedef Tail HeadType;
+};
+
+
+template <class Head, class Tail, class T>
+struct TypeOneEraser<TypeList<Head, Tail>, T>
+{
+	typedef TypeList <Head, typename TypeOneEraser<Tail, T>::HeadType> HeadType;
+};
+
+
+template <class Head, class T> 
+struct TypeAllEraser;
+	/// TypeAllEraser erases all the occurences of the type T in Head.
+	/// Usage:
+	///
+	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
+	/// typedef TypeAllEraser<Type4, int>::HeadType Type2;
+	/// (Type2 is a TypeList of char,float)
+	///
+
+
+template <class T>
+struct TypeAllEraser<NullTypeList, T>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <class T, class Tail>
+struct TypeAllEraser<TypeList<T, Tail>, T>
+{
+	typedef typename TypeAllEraser<Tail, T>::HeadType HeadType;
+};
+
+
+template <class Head, class Tail, class T>
+struct TypeAllEraser<TypeList<Head, Tail>, T>
+{
+	typedef TypeList <Head, typename TypeAllEraser<Tail, T>::HeadType> HeadType;
+};
+
+
+template <class Head> 
+struct TypeDuplicateEraser;
+	/// TypeDuplicateEraser erases all but the first occurence of the type T in Head.
+	/// Usage:
+	///
+	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
+	/// typedef TypeDuplicateEraser<Type4, int>::HeadType Type3;
+	/// (Type3 is a TypeList of char,int,float)
+	///
+
+
+template <> 
+struct TypeDuplicateEraser<NullTypeList>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <class Head, class Tail>
+struct TypeDuplicateEraser<TypeList<Head, Tail> >
+{
+private:
+	typedef typename TypeDuplicateEraser<Tail>::HeadType L1;
+	typedef typename TypeOneEraser<L1, Head>::HeadType L2;
+public:
+	typedef TypeList<Head, L2> HeadType;
+};
+
+
+template <class Head, class T, class R>
+struct TypeOneReplacer;
+	/// TypeOneReplacer replaces the first occurence 
+	/// of the type T in Head with type R.
+	/// Usage:
+	///
+	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
+	/// typedef TypeOneReplacer<Type4, int, double>::HeadType TypeR;
+	/// (TypeR is a TypeList of char,double,float,int)
+	///
+
+
+template <class T, class R>
+struct TypeOneReplacer<NullTypeList, T, R>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <class T, class Tail, class R>
+struct TypeOneReplacer<TypeList<T, Tail>, T, R>
+{
+	typedef TypeList<R, Tail> HeadType;
+};
+
+
+template <class Head, class Tail, class T, class R>
+struct TypeOneReplacer<TypeList<Head, Tail>, T, R>
+{
+	typedef TypeList<Head, typename TypeOneReplacer<Tail, T, R>::HeadType> HeadType;
+};
+
+
+template <class Head, class T, class R>
+struct TypeAllReplacer;
+	/// TypeAllReplacer replaces all the occurences 
+	/// of the type T in Head with type R.
+	/// Usage:
+	///
+	/// typedef TypeListType<char, int, float, int>::HeadType Type4;
+	/// typedef TypeAllReplacer<Type4, int, double>::HeadType TypeR;
+	/// (TypeR is a TypeList of char,double,float,double)
+	///
+
+
+template <class T, class R>
+struct TypeAllReplacer<NullTypeList, T, R>
+{
+	typedef NullTypeList HeadType;
+};
+
+
+template <class T, class Tail, class R>
+struct TypeAllReplacer<TypeList<T, Tail>, T, R>
+{
+	typedef TypeList<R, typename TypeAllReplacer<Tail, T, R>::HeadType> HeadType;
+};
+
+
+template <class Head, class Tail, class T, class R>
+struct TypeAllReplacer<TypeList<Head, Tail>, T, R>
+{
+	typedef TypeList<Head, typename TypeAllReplacer<Tail, T, R>::HeadType> HeadType;
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/UTF8String.h b/Foundation/include/Poco/UTF8String.h
index 288ed13d5..3d1dad1ef 100644
--- a/Foundation/include/Poco/UTF8String.h
+++ b/Foundation/include/Poco/UTF8String.h
@@ -1,80 +1,80 @@
-//
-// UTF8String.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UTF8String.h#2 $
-//
-// Library: Foundation
-// Package: Text
-// Module:  UTF8String
-//
-// Definition of the UTF8 string functions.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_UTF8String_INCLUDED
-#define Foundation_UTF8String_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-namespace Poco {
-
-
-struct Foundation_API UTF8
-	/// This class provides static methods that are UTF-8 capable variants
-	/// of the same functions in Poco/String.h.
-	///
-	/// The various variants of icompare() provide case insensitive comparison
-	/// for UTF-8 encoded strings.
-	///
-	/// toUpper(), toUpperInPlace(), toLower() and toLowerInPlace() provide
-	/// Unicode-based character case transformation for UTF-8 encoded strings.
-{
-	static int icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, std::string::const_iterator it2, std::string::const_iterator end2);
-	static int icompare(const std::string& str1, const std::string& str2);
-	static int icompare(const std::string& str1, std::string::size_type n1, const std::string& str2, std::string::size_type n2);
-	static int icompare(const std::string& str1, std::string::size_type n, const std::string& str2);
-	static int icompare(const std::string& str1, std::string::size_type pos, std::string::size_type n, const std::string& str2);
-	static int icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n1, const std::string& str2, std::string::size_type pos2, std::string::size_type n2);
-	static int icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n, const std::string& str2, std::string::size_type pos2);
-	static int icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr);
-	static int icompare(const std::string& str, std::string::size_type pos, const std::string::value_type* ptr);
-	static int icompare(const std::string& str, const std::string::value_type* ptr);
-
-	static std::string toUpper(const std::string& str);
-	static std::string& toUpperInPlace(std::string& str);
-	static std::string toLower(const std::string& str);
-	static std::string& toLowerInPlace(std::string& str);
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_UTF8String_INCLUDED
+//
+// UTF8String.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UTF8String.h#2 $
+//
+// Library: Foundation
+// Package: Text
+// Module:  UTF8String
+//
+// Definition of the UTF8 string functions.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_UTF8String_INCLUDED
+#define Foundation_UTF8String_INCLUDED
+
+
+#include "Poco/Foundation.h"
+
+
+namespace Poco {
+
+
+struct Foundation_API UTF8
+	/// This class provides static methods that are UTF-8 capable variants
+	/// of the same functions in Poco/String.h.
+	///
+	/// The various variants of icompare() provide case insensitive comparison
+	/// for UTF-8 encoded strings.
+	///
+	/// toUpper(), toUpperInPlace(), toLower() and toLowerInPlace() provide
+	/// Unicode-based character case transformation for UTF-8 encoded strings.
+{
+	static int icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, std::string::const_iterator it2, std::string::const_iterator end2);
+	static int icompare(const std::string& str1, const std::string& str2);
+	static int icompare(const std::string& str1, std::string::size_type n1, const std::string& str2, std::string::size_type n2);
+	static int icompare(const std::string& str1, std::string::size_type n, const std::string& str2);
+	static int icompare(const std::string& str1, std::string::size_type pos, std::string::size_type n, const std::string& str2);
+	static int icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n1, const std::string& str2, std::string::size_type pos2, std::string::size_type n2);
+	static int icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n, const std::string& str2, std::string::size_type pos2);
+	static int icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr);
+	static int icompare(const std::string& str, std::string::size_type pos, const std::string::value_type* ptr);
+	static int icompare(const std::string& str, const std::string::value_type* ptr);
+
+	static std::string toUpper(const std::string& str);
+	static std::string& toUpperInPlace(std::string& str);
+	static std::string toLower(const std::string& str);
+	static std::string& toLowerInPlace(std::string& str);
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_UTF8String_INCLUDED
diff --git a/Foundation/include/Poco/UnWindows.h b/Foundation/include/Poco/UnWindows.h
index 16c62000f..abc32bc64 100644
--- a/Foundation/include/Poco/UnWindows.h
+++ b/Foundation/include/Poco/UnWindows.h
@@ -1,110 +1,110 @@
-//
-// UnWindows.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UnWindows.h#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  UnWindows
-//
-// A wrapper around the "Poco/UnWindows.h" header file that #undef's some
-// of the macros for function names defined by "Poco/UnWindows.h" that
-// are a frequent source of conflicts (e.g., GetUserName).
-//
-// Remember, that most of the WIN32 API functions come in two variants,
-// an Unicode variant (e.g., GetUserNameA) and an ASCII variant (GetUserNameW).
-// There is also a macro (GetUserName) that's either defined to be the Unicode
-// name or the ASCII name, depending on whether the UNICODE macro is #define'd
-// or not. POCO always calls the Unicode or ASCII functions directly (depending
-// on whether POCO_WIN32_UTF8 is #define'd or not), so the macros are not ignored.
-//
-// These macro definitions are a frequent case of problems and naming conflicts,
-// especially for C++ programmers. Say, you define a class with a member function named
-// GetUserName. Depending on whether "Poco/UnWindows.h" has been included by a particular
-// translation unit or not, this might be changed to GetUserNameA/GetUserNameW, or not.
-// While, due to naming conventions used, this is less of a problem in POCO, some
-// of the users of POCO might use a different naming convention where this can become
-// a problem.
-//
-// To disable the #undef's, compile POCO with the POCO_NO_UNWINDOWS macro #define'd.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include <windows.h>
-
-
-#if !defined(POCO_NO_UNWINDOWS)
-// A list of annoying macros to #undef.
-// Feel free to extend as required.
-#undef GetBinaryType
-#undef GetShortPathName
-#undef GetLongPathName
-#undef GetEnvironmentStrings
-#undef SetEnvironmentStrings
-#undef FreeEnvironmentStrings
-#undef FormatMessage
-#undef EncryptFile
-#undef DecryptFile
-#undef CreateMutex
-#undef OpenMutex
-#undef CreateEvent
-#undef OpenEvent
-#undef CreateSemaphore
-#undef OpenSemaphore
-#undef LoadLibrary
-#undef GetModuleFileName
-#undef CreateProcess
-#undef GetCommandLine
-#undef GetEnvironmentVariable
-#undef SetEnvironmentVariable
-#undef ExpandEnvironmentStrings
-#undef OutputDebugString
-#undef FindResource
-#undef UpdateResource
-#undef FindAtom
-#undef AddAtom
-#undef GetSystemDirector
-#undef GetTempPath
-#undef GetTempFileName
-#undef SetCurrentDirectory
-#undef GetCurrentDirectory
-#undef CreateDirectory
-#undef RemoveDirectory
-#undef CreateFile
-#undef DeleteFile
-#undef SearchPath
-#undef CopyFile
-#undef MoveFile
-#undef ReplaceFile
-#undef GetComputerName
-#undef SetComputerName
-#undef GetUserName
-#undef LogonUser
-#undef GetVersion
-#undef GetObject
-#endif // POCO_NO_UNWINDOWS
+//
+// UnWindows.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UnWindows.h#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  UnWindows
+//
+// A wrapper around the "Poco/UnWindows.h" header file that #undef's some
+// of the macros for function names defined by "Poco/UnWindows.h" that
+// are a frequent source of conflicts (e.g., GetUserName).
+//
+// Remember, that most of the WIN32 API functions come in two variants,
+// an Unicode variant (e.g., GetUserNameA) and an ASCII variant (GetUserNameW).
+// There is also a macro (GetUserName) that's either defined to be the Unicode
+// name or the ASCII name, depending on whether the UNICODE macro is #define'd
+// or not. POCO always calls the Unicode or ASCII functions directly (depending
+// on whether POCO_WIN32_UTF8 is #define'd or not), so the macros are not ignored.
+//
+// These macro definitions are a frequent case of problems and naming conflicts,
+// especially for C++ programmers. Say, you define a class with a member function named
+// GetUserName. Depending on whether "Poco/UnWindows.h" has been included by a particular
+// translation unit or not, this might be changed to GetUserNameA/GetUserNameW, or not.
+// While, due to naming conventions used, this is less of a problem in POCO, some
+// of the users of POCO might use a different naming convention where this can become
+// a problem.
+//
+// To disable the #undef's, compile POCO with the POCO_NO_UNWINDOWS macro #define'd.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include <windows.h>
+
+
+#if !defined(POCO_NO_UNWINDOWS)
+// A list of annoying macros to #undef.
+// Feel free to extend as required.
+#undef GetBinaryType
+#undef GetShortPathName
+#undef GetLongPathName
+#undef GetEnvironmentStrings
+#undef SetEnvironmentStrings
+#undef FreeEnvironmentStrings
+#undef FormatMessage
+#undef EncryptFile
+#undef DecryptFile
+#undef CreateMutex
+#undef OpenMutex
+#undef CreateEvent
+#undef OpenEvent
+#undef CreateSemaphore
+#undef OpenSemaphore
+#undef LoadLibrary
+#undef GetModuleFileName
+#undef CreateProcess
+#undef GetCommandLine
+#undef GetEnvironmentVariable
+#undef SetEnvironmentVariable
+#undef ExpandEnvironmentStrings
+#undef OutputDebugString
+#undef FindResource
+#undef UpdateResource
+#undef FindAtom
+#undef AddAtom
+#undef GetSystemDirector
+#undef GetTempPath
+#undef GetTempFileName
+#undef SetCurrentDirectory
+#undef GetCurrentDirectory
+#undef CreateDirectory
+#undef RemoveDirectory
+#undef CreateFile
+#undef DeleteFile
+#undef SearchPath
+#undef CopyFile
+#undef MoveFile
+#undef ReplaceFile
+#undef GetComputerName
+#undef SetComputerName
+#undef GetUserName
+#undef LogonUser
+#undef GetVersion
+#undef GetObject
+#endif // POCO_NO_UNWINDOWS
diff --git a/Foundation/include/Poco/Unicode.h b/Foundation/include/Poco/Unicode.h
index f7048435e..c5bb112fe 100644
--- a/Foundation/include/Poco/Unicode.h
+++ b/Foundation/include/Poco/Unicode.h
@@ -1,216 +1,216 @@
-//
-// Unicode.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/Unicode.h#2 $
-//
-// Library: Foundation
-// Package: Text
-// Module:  Unicode
-//
-// Definition of the Unicode class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_Unicode_INCLUDED
-#define Foundation_Unicode_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-namespace Poco {
-
-
-class Foundation_API Unicode
-	/// This class contains enumerations and static
-	/// utility functions for dealing with Unicode characters
-	/// and their properties.
-	///
-	/// For more information on Unicode, see <http://www.unicode.org>.
-	///
-	/// The implementation is based on the Unicode support
-	/// functions in PCRE.
-{
-public:
-	// Implementation note: the following definitions must be kept
-	// in sync with those from ucp.h (PCRE).
-	enum CharacterCategory
-		/// Unicode 5.0 character categories.
-	{
-		UCP_OTHER,
-		UCP_LETTER,
-		UCP_MARK,
-		UCP_NUMBER,
-		UCP_PUNCTUATION,
-		UCP_SYMBOL,
-		UCP_SEPARATOR
-	};
-
-	enum CharacterType
-		/// Unicode 5.0 character types.
-	{
-		UCP_CONTROL,
-		UCP_FORMAT,
-		UCP_UNASSIGNED,
-		UCP_PRIVATE_USE,
-		UCP_SURROGATE,
-		UCP_LOWER_CASE_LETTER,
-		UCP_MODIFIER_LETTER,
-		UCP_OTHER_LETTER,
-		UCP_TITLE_CASE_LETTER,
-		UCP_UPPER_CASE_LETTER,
-		UCP_SPACING_MARK,
-		UCP_ENCLOSING_MARK,
-		UCP_NON_SPACING_MARK,
-		UCP_DECIMAL_NUMBER,
-		UCP_LETTER_NUMBER,
-		UCP_OTHER_NUMBER,
-		UCP_CONNECTOR_PUNCTUATION,
-		UCP_DASH_PUNCTUATION,
-		UCP_CLOSE_PUNCTUATION,
-		UCP_FINAL_PUNCTUATION,
-		UCP_INITIAL_PUNCTUATION,
-		UCP_OTHER_PUNCTUATION,
-		UCP_OPEN_PUNCTUATION,
-		UCP_CURRENCY_SYMBOL,
-		UCP_MODIFIER_SYMBOL,
-		UCP_MATHEMATICAL_SYMBOL,
-		UCP_OTHER_SYMBOL,
-		UCP_LINE_SEPARATOR,
-		UCP_PARAGRAPH_SEPARATOR,
-		UCP_SPACE_SEPARATOR
-	};
-	
-	enum Script
-		/// Unicode 5.0 scripts.
-	{
-		UCP_ARABIC,
-		UCP_ARMENIAN,
-		UCP_BENGALI,
-		UCP_BOPOMOFO,
-		UCP_BRAILLE,
-		UCP_BUGINESE,
-		UCP_BUHID,
-		UCP_CANADIAN_ABORIGINAL,
-		UCP_CHEROKEE,
-		UCP_COMMON,
-		UCP_COPTIC,
-		UCP_CYPRIOT,
-		UCP_CYRILLIC,
-		UCP_DESERET,
-		UCP_DEVANAGARI,
-		UCP_ETHIOPIC,
-		UCP_GEORGIAN,
-		UCP_GLAGOLITIC,
-		UCP_GOTHIC,
-		UCP_GREEK,
-		UCP_GUJARATI,
-		UCP_GURMUKHI,
-		UCP_HAN,
-		UCP_HANGUL,
-		UCP_HANUNOO,
-		UCP_HEBREW,
-		UCP_HIRAGANA,
-		UCP_INHERITED,
-		UCP_KANNADA,
-		UCP_KATAKANA,
-		UCP_KHAROSHTHI,
-		UCP_KHMER,
-		UCP_LAO,
-		UCP_LATIN,
-		UCP_LIMBU,
-		UCP_LINEAR_B,
-		UCP_MALAYALAM,
-		UCP_MONGOLIAN,
-		UCP_MYANMAR,
-		UCP_NEW_TAI_LUE,
-		UCP_OGHAM,
-		UCP_OLD_ITALIC,
-		UCP_OLD_PERSIAN,
-		UCP_ORIYA,
-		UCP_OSMANYA,
-		UCP_RUNIC,
-		UCP_SHAVIAN,
-		UCP_SINHALA,
-		UCP_SYLOTI_NAGRI,
-		UCP_SYRIAC,
-		UCP_TAGALOG,
-		UCP_TAGBANWA,
-		UCP_TAI_LE,
-		UCP_TAMIL,
-		UCP_TELUGU,
-		UCP_THAANA,
-		UCP_THAI,
-		UCP_TIBETAN,
-		UCP_TIFINAGH,
-		UCP_UGARITIC,
-		UCP_YI,
-		UCP_BALINESE,
-		UCP_CUNEIFORM,
-		UCP_NKO,
-		UCP_PHAGS_PA,
-		UCP_PHOENICIAN
-	};
-	
-	struct CharacterProperties
-		/// This structure holds the character properties
-		/// of an Unicode character.
-	{
-		CharacterCategory category;
-		CharacterType     type;
-		Script            script;
-	};
-
-	static void properties(int ch, CharacterProperties& props);
-		/// Return the Unicode character properties for the
-		/// character with the given Unicode value.
-		
-	static bool isLower(int ch);
-		/// Returns true iff the given character is a lowercase
-		/// character.
-		
-	static bool isUpper(int ch);
-		/// Returns true iff the given character is an uppercase
-		/// character.
-		
-	static int toLower(int ch);
-		/// If the given character is an uppercase character,
-		/// return its lowercase counterpart, otherwise return
-		/// the character.
-
-	static int toUpper(int ch);
-		/// If the given character is a lowercase character,
-		/// return its uppercase counterpart, otherwise return
-		/// the character.
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_Unicode_INCLUDED
+//
+// Unicode.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/Unicode.h#2 $
+//
+// Library: Foundation
+// Package: Text
+// Module:  Unicode
+//
+// Definition of the Unicode class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_Unicode_INCLUDED
+#define Foundation_Unicode_INCLUDED
+
+
+#include "Poco/Foundation.h"
+
+
+namespace Poco {
+
+
+class Foundation_API Unicode
+	/// This class contains enumerations and static
+	/// utility functions for dealing with Unicode characters
+	/// and their properties.
+	///
+	/// For more information on Unicode, see <http://www.unicode.org>.
+	///
+	/// The implementation is based on the Unicode support
+	/// functions in PCRE.
+{
+public:
+	// Implementation note: the following definitions must be kept
+	// in sync with those from ucp.h (PCRE).
+	enum CharacterCategory
+		/// Unicode 5.0 character categories.
+	{
+		UCP_OTHER,
+		UCP_LETTER,
+		UCP_MARK,
+		UCP_NUMBER,
+		UCP_PUNCTUATION,
+		UCP_SYMBOL,
+		UCP_SEPARATOR
+	};
+
+	enum CharacterType
+		/// Unicode 5.0 character types.
+	{
+		UCP_CONTROL,
+		UCP_FORMAT,
+		UCP_UNASSIGNED,
+		UCP_PRIVATE_USE,
+		UCP_SURROGATE,
+		UCP_LOWER_CASE_LETTER,
+		UCP_MODIFIER_LETTER,
+		UCP_OTHER_LETTER,
+		UCP_TITLE_CASE_LETTER,
+		UCP_UPPER_CASE_LETTER,
+		UCP_SPACING_MARK,
+		UCP_ENCLOSING_MARK,
+		UCP_NON_SPACING_MARK,
+		UCP_DECIMAL_NUMBER,
+		UCP_LETTER_NUMBER,
+		UCP_OTHER_NUMBER,
+		UCP_CONNECTOR_PUNCTUATION,
+		UCP_DASH_PUNCTUATION,
+		UCP_CLOSE_PUNCTUATION,
+		UCP_FINAL_PUNCTUATION,
+		UCP_INITIAL_PUNCTUATION,
+		UCP_OTHER_PUNCTUATION,
+		UCP_OPEN_PUNCTUATION,
+		UCP_CURRENCY_SYMBOL,
+		UCP_MODIFIER_SYMBOL,
+		UCP_MATHEMATICAL_SYMBOL,
+		UCP_OTHER_SYMBOL,
+		UCP_LINE_SEPARATOR,
+		UCP_PARAGRAPH_SEPARATOR,
+		UCP_SPACE_SEPARATOR
+	};
+	
+	enum Script
+		/// Unicode 5.0 scripts.
+	{
+		UCP_ARABIC,
+		UCP_ARMENIAN,
+		UCP_BENGALI,
+		UCP_BOPOMOFO,
+		UCP_BRAILLE,
+		UCP_BUGINESE,
+		UCP_BUHID,
+		UCP_CANADIAN_ABORIGINAL,
+		UCP_CHEROKEE,
+		UCP_COMMON,
+		UCP_COPTIC,
+		UCP_CYPRIOT,
+		UCP_CYRILLIC,
+		UCP_DESERET,
+		UCP_DEVANAGARI,
+		UCP_ETHIOPIC,
+		UCP_GEORGIAN,
+		UCP_GLAGOLITIC,
+		UCP_GOTHIC,
+		UCP_GREEK,
+		UCP_GUJARATI,
+		UCP_GURMUKHI,
+		UCP_HAN,
+		UCP_HANGUL,
+		UCP_HANUNOO,
+		UCP_HEBREW,
+		UCP_HIRAGANA,
+		UCP_INHERITED,
+		UCP_KANNADA,
+		UCP_KATAKANA,
+		UCP_KHAROSHTHI,
+		UCP_KHMER,
+		UCP_LAO,
+		UCP_LATIN,
+		UCP_LIMBU,
+		UCP_LINEAR_B,
+		UCP_MALAYALAM,
+		UCP_MONGOLIAN,
+		UCP_MYANMAR,
+		UCP_NEW_TAI_LUE,
+		UCP_OGHAM,
+		UCP_OLD_ITALIC,
+		UCP_OLD_PERSIAN,
+		UCP_ORIYA,
+		UCP_OSMANYA,
+		UCP_RUNIC,
+		UCP_SHAVIAN,
+		UCP_SINHALA,
+		UCP_SYLOTI_NAGRI,
+		UCP_SYRIAC,
+		UCP_TAGALOG,
+		UCP_TAGBANWA,
+		UCP_TAI_LE,
+		UCP_TAMIL,
+		UCP_TELUGU,
+		UCP_THAANA,
+		UCP_THAI,
+		UCP_TIBETAN,
+		UCP_TIFINAGH,
+		UCP_UGARITIC,
+		UCP_YI,
+		UCP_BALINESE,
+		UCP_CUNEIFORM,
+		UCP_NKO,
+		UCP_PHAGS_PA,
+		UCP_PHOENICIAN
+	};
+	
+	struct CharacterProperties
+		/// This structure holds the character properties
+		/// of an Unicode character.
+	{
+		CharacterCategory category;
+		CharacterType     type;
+		Script            script;
+	};
+
+	static void properties(int ch, CharacterProperties& props);
+		/// Return the Unicode character properties for the
+		/// character with the given Unicode value.
+		
+	static bool isLower(int ch);
+		/// Returns true iff the given character is a lowercase
+		/// character.
+		
+	static bool isUpper(int ch);
+		/// Returns true iff the given character is an uppercase
+		/// character.
+		
+	static int toLower(int ch);
+		/// If the given character is an uppercase character,
+		/// return its lowercase counterpart, otherwise return
+		/// the character.
+
+	static int toUpper(int ch);
+		/// If the given character is a lowercase character,
+		/// return its uppercase counterpart, otherwise return
+		/// the character.
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_Unicode_INCLUDED
diff --git a/Foundation/include/Poco/UniqueAccessExpireCache.h b/Foundation/include/Poco/UniqueAccessExpireCache.h
index f30ae9b97..2fe45a38b 100644
--- a/Foundation/include/Poco/UniqueAccessExpireCache.h
+++ b/Foundation/include/Poco/UniqueAccessExpireCache.h
@@ -1,89 +1,89 @@
-//
-// UniqueAccessExpireCache.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireCache.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  UniqueAccessExpireCache
-//
-// Definition of the UniqueAccessExpireCache class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_UniqueAccessExpireCache_INCLUDED
-#define  Foundation_UniqueAccessExpireCache_INCLUDED
-
-
-#include "Poco/AbstractCache.h"
-#include "Poco/UniqueAccessExpireStrategy.h"
-
-
-namespace Poco {
-
-
-template <class TKey, class TValue> 
-class UniqueAccessExpireCache: public AbstractCache<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue> >
-	/// An UniqueAccessExpireCache caches entries for a given time span. In contrast
-	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define 
-	/// expiration per CacheEntry.
-	/// Each TValue object must thus offer the following method:
-	///    
-	///    const Poco::Timespan& getTimeout() const;
-	///    
-	/// which returns the relative timespan for how long the entry should be valid without being accessed!
-	/// The absolute expire timepoint is calculated as now() + getTimeout().
-	/// Accessing an object will update this absolute expire timepoint.
-	/// You can use the Poco::AccessExpirationDecorator to add the getExpiration
-	/// method to values that do not have a getExpiration function.
-	///
-	/// Be careful when using an UniqueAccessExpireCache. A cache is often used
-	/// like cache.has(x) followed by cache.get x). Note that it could happen
-	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
-	/// when "get" is invoked.
-{
-public:
-	UniqueAccessExpireCache():
-		AbstractCache<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue> >(UniqueAccessExpireStrategy<TKey, TValue>())
-	{
-	}
-
-	~UniqueAccessExpireCache()
-	{
-	}
-
-private:
-	UniqueAccessExpireCache(const UniqueAccessExpireCache& aCache);
-	UniqueAccessExpireCache& operator = (const UniqueAccessExpireCache& aCache);
-};
-
-
-} // namespace Poco
-
-#endif
+//
+// UniqueAccessExpireCache.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireCache.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  UniqueAccessExpireCache
+//
+// Definition of the UniqueAccessExpireCache class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_UniqueAccessExpireCache_INCLUDED
+#define  Foundation_UniqueAccessExpireCache_INCLUDED
+
+
+#include "Poco/AbstractCache.h"
+#include "Poco/UniqueAccessExpireStrategy.h"
+
+
+namespace Poco {
+
+
+template <class TKey, class TValue> 
+class UniqueAccessExpireCache: public AbstractCache<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue> >
+	/// An UniqueAccessExpireCache caches entries for a given time span. In contrast
+	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define 
+	/// expiration per CacheEntry.
+	/// Each TValue object must thus offer the following method:
+	///    
+	///    const Poco::Timespan& getTimeout() const;
+	///    
+	/// which returns the relative timespan for how long the entry should be valid without being accessed!
+	/// The absolute expire timepoint is calculated as now() + getTimeout().
+	/// Accessing an object will update this absolute expire timepoint.
+	/// You can use the Poco::AccessExpirationDecorator to add the getExpiration
+	/// method to values that do not have a getExpiration function.
+	///
+	/// Be careful when using an UniqueAccessExpireCache. A cache is often used
+	/// like cache.has(x) followed by cache.get x). Note that it could happen
+	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// when "get" is invoked.
+{
+public:
+	UniqueAccessExpireCache():
+		AbstractCache<TKey, TValue, UniqueAccessExpireStrategy<TKey, TValue> >(UniqueAccessExpireStrategy<TKey, TValue>())
+	{
+	}
+
+	~UniqueAccessExpireCache()
+	{
+	}
+
+private:
+	UniqueAccessExpireCache(const UniqueAccessExpireCache& aCache);
+	UniqueAccessExpireCache& operator = (const UniqueAccessExpireCache& aCache);
+};
+
+
+} // namespace Poco
+
+#endif
diff --git a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h
index e75438f9c..fb298d226 100644
--- a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h
+++ b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h
@@ -1,91 +1,91 @@
-//
-// UniqueAccessExpireLRUCache.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireLRUCache.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  UniqueAccessExpireLRUCache
-//
-// Definition of the UniqueAccessExpireLRUCache class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_UniqueAccessExpireLRUCache_INCLUDED
-#define  Foundation_UniqueAccessExpireLRUCache_INCLUDED
-
-
-#include "Poco/AbstractCache.h"
-#include "Poco/StrategyCollection.h"
-#include "Poco/UniqueAccessExpireStrategy.h"
-#include "Poco/LRUStrategy.h"
-
-
-namespace Poco {
-
-
-template < 
-	class TKey,
-	class TValue
->
-class UniqueAccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >
-	/// A UniqueAccessExpireLRUCache combines LRU caching and time based per entry expire caching.
-	/// One can define for each cache entry a seperate timepoint
-	/// but also limit the size of the cache (per default: 1024).
-	/// Each TValue object must thus offer the following method:
-	///    
-	///    const Poco::Timespan& getTimeout() const;
-	///    
-	/// which returns the relative timespan for how long the entry should be valid without being accessed!
-	/// The absolute expire timepoint is calculated as now() + getTimeout().
-	/// Accessing an object will update this absolute expire timepoint.
-	/// You can use the Poco::AccessExpirationDecorator to add the getExpiration
-	/// method to values that do not have a getExpiration function.
-{
-public:
-	UniqueAccessExpireLRUCache(long cacheSize = 1024): 
-		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >(StrategyCollection<TKey, TValue>())
-	{
-		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
-		this->_strategy.pushBack(new UniqueAccessExpireStrategy<TKey, TValue>());
-	}
-
-	~UniqueAccessExpireLRUCache()
-	{
-	}
-
-private:
-	UniqueAccessExpireLRUCache(const UniqueAccessExpireLRUCache& aCache);
-	UniqueAccessExpireLRUCache& operator = (const UniqueAccessExpireLRUCache& aCache);
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// UniqueAccessExpireLRUCache.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireLRUCache.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  UniqueAccessExpireLRUCache
+//
+// Definition of the UniqueAccessExpireLRUCache class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_UniqueAccessExpireLRUCache_INCLUDED
+#define  Foundation_UniqueAccessExpireLRUCache_INCLUDED
+
+
+#include "Poco/AbstractCache.h"
+#include "Poco/StrategyCollection.h"
+#include "Poco/UniqueAccessExpireStrategy.h"
+#include "Poco/LRUStrategy.h"
+
+
+namespace Poco {
+
+
+template < 
+	class TKey,
+	class TValue
+>
+class UniqueAccessExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >
+	/// A UniqueAccessExpireLRUCache combines LRU caching and time based per entry expire caching.
+	/// One can define for each cache entry a seperate timepoint
+	/// but also limit the size of the cache (per default: 1024).
+	/// Each TValue object must thus offer the following method:
+	///    
+	///    const Poco::Timespan& getTimeout() const;
+	///    
+	/// which returns the relative timespan for how long the entry should be valid without being accessed!
+	/// The absolute expire timepoint is calculated as now() + getTimeout().
+	/// Accessing an object will update this absolute expire timepoint.
+	/// You can use the Poco::AccessExpirationDecorator to add the getExpiration
+	/// method to values that do not have a getExpiration function.
+{
+public:
+	UniqueAccessExpireLRUCache(long cacheSize = 1024): 
+		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >(StrategyCollection<TKey, TValue>())
+	{
+		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
+		this->_strategy.pushBack(new UniqueAccessExpireStrategy<TKey, TValue>());
+	}
+
+	~UniqueAccessExpireLRUCache()
+	{
+	}
+
+private:
+	UniqueAccessExpireLRUCache(const UniqueAccessExpireLRUCache& aCache);
+	UniqueAccessExpireLRUCache& operator = (const UniqueAccessExpireLRUCache& aCache);
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/UniqueAccessExpireStrategy.h b/Foundation/include/Poco/UniqueAccessExpireStrategy.h
index 67d423bb9..2acb53c61 100644
--- a/Foundation/include/Poco/UniqueAccessExpireStrategy.h
+++ b/Foundation/include/Poco/UniqueAccessExpireStrategy.h
@@ -1,178 +1,178 @@
-//
-// UniqueAccessExpireStrategy.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireStrategy.h#3 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  UniqueAccessExpireStrategy
-//
-// Definition of the UniqueAccessExpireStrategy class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_UniqueAccessExpireStrategy_INCLUDED
-#define  Foundation_UniqueAccessExpireStrategy_INCLUDED
-
-#include "Poco/KeyValueArgs.h"
-#include "Poco/ValidArgs.h"
-#include "Poco/AbstractStrategy.h"
-#include "Poco/Bugcheck.h"
-#include "Poco/Timestamp.h"
-#include "Poco/Timespan.h"
-#include "Poco/EventArgs.h"
-#include "Poco/UniqueExpireStrategy.h"
-#include <set>
-#include <map>
-#include <stdio.h>
-
-
-namespace Poco {
-
-
-
-template < 
-	class TKey,
-	class TValue
->
-class UniqueAccessExpireStrategy: public AbstractStrategy<TKey, TValue>
-	/// An UniqueExpireStrategy implements time based expiration of cache entries. In contrast
-	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define 
-	/// expiration per CacheEntry.
-	/// Each TValue object must thus offer the following method:
-	///    
-	///    const Poco::Timestamp& getTimeout() const;
-	///    
-	/// which returns the timespan for how long an object will be valid without being accessed.
-{
-public:
-	typedef std::pair<TKey, Timespan> KeyExpire;
-	typedef std::multimap<Timestamp, KeyExpire>     TimeIndex;
-	typedef typename TimeIndex::iterator       IndexIterator;
-	typedef typename TimeIndex::const_iterator ConstIndexIterator;
-	typedef std::map<TKey, IndexIterator>      Keys;
-	typedef typename Keys::iterator            Iterator;
-
-public:
-	UniqueAccessExpireStrategy()
-		/// Create an unique expire strategy.
-	{
-	}
-
-	~UniqueAccessExpireStrategy()
-	{
-	}
-
-	void onAdd(const void*, const KeyValueArgs <TKey, TValue>& args)
-	{
-		// the expire value defines how many millisecs in the future the
-		// value will expire, even insert negative values!
-		Timestamp expire;
-		expire += args.value().getTimeout().totalMicroseconds();
-		
-		IndexIterator it = _keyIndex.insert(std::make_pair(expire, std::make_pair(args.key(), args.value().getTimeout())));
-		std::pair<Iterator, bool> stat = _keys.insert(std::make_pair(args.key(), it));
-		if (!stat.second)
-		{
-			_keyIndex.erase(stat.first->second);
-			stat.first->second = it;
-		}
-	}
-
-	void onRemove(const void*, const TKey& key)
-	{
-		Iterator it = _keys.find(key);
-		if (it != _keys.end())
-		{
-			_keyIndex.erase(it->second);
-			_keys.erase(it);
-		}
-	}
-
-	void onGet(const void*, const TKey& key)
-	{
-		// get updates the expiration time stamp
-		Iterator it = _keys.find(key);
-		if (it != _keys.end())
-		{
-			KeyExpire ke = it->second->second;
-			// gen new absolute expire value
-			Timestamp expire;
-			expire += ke.second.totalMicroseconds();
-			// delete old index
-			_keyIndex.erase(it->second);
-			IndexIterator itt = _keyIndex.insert(std::make_pair(expire, ke));
-			// update iterator
-			it->second = itt;
-		}
-	}
-
-	void onClear(const void*, const EventArgs& args)
-	{
-		_keys.clear();
-		_keyIndex.clear();
-	}
-
-	void onIsValid(const void*, ValidArgs<TKey>& args)
-	{
-		Iterator it = _keys.find(args.key());
-		if (it != _keys.end())
-		{
-			Timestamp now;
-			if (it->second->first <= now)
-			{
-				args.invalidate();
-			}
-		}
-		else //not found: probably removed by onReplace
-			args.invalidate();
-	}
-
-	void onReplace(const void*, std::set<TKey>& elemsToRemove)
-	{
-		// Note: replace only informs the cache which elements
-		// it would like to remove!
-		// it does not remove them on its own!
-		IndexIterator it = _keyIndex.begin();
-		Timestamp now;
-		while (it != _keyIndex.end() && it->first < now)
-		{
-			elemsToRemove.insert(it->second.first);
-			++it;
-		}
-	}
-
-protected:
-	Keys      _keys;     /// For faster replacement of keys, the iterator points to the _keyIndex map
-	TimeIndex _keyIndex; /// Maps time to key value
-};
-
-
-} // namespace Poco
-
-#endif
+//
+// UniqueAccessExpireStrategy.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UniqueAccessExpireStrategy.h#3 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  UniqueAccessExpireStrategy
+//
+// Definition of the UniqueAccessExpireStrategy class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_UniqueAccessExpireStrategy_INCLUDED
+#define  Foundation_UniqueAccessExpireStrategy_INCLUDED
+
+#include "Poco/KeyValueArgs.h"
+#include "Poco/ValidArgs.h"
+#include "Poco/AbstractStrategy.h"
+#include "Poco/Bugcheck.h"
+#include "Poco/Timestamp.h"
+#include "Poco/Timespan.h"
+#include "Poco/EventArgs.h"
+#include "Poco/UniqueExpireStrategy.h"
+#include <set>
+#include <map>
+#include <stdio.h>
+
+
+namespace Poco {
+
+
+
+template < 
+	class TKey,
+	class TValue
+>
+class UniqueAccessExpireStrategy: public AbstractStrategy<TKey, TValue>
+	/// An UniqueExpireStrategy implements time based expiration of cache entries. In contrast
+	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define 
+	/// expiration per CacheEntry.
+	/// Each TValue object must thus offer the following method:
+	///    
+	///    const Poco::Timestamp& getTimeout() const;
+	///    
+	/// which returns the timespan for how long an object will be valid without being accessed.
+{
+public:
+	typedef std::pair<TKey, Timespan> KeyExpire;
+	typedef std::multimap<Timestamp, KeyExpire>     TimeIndex;
+	typedef typename TimeIndex::iterator       IndexIterator;
+	typedef typename TimeIndex::const_iterator ConstIndexIterator;
+	typedef std::map<TKey, IndexIterator>      Keys;
+	typedef typename Keys::iterator            Iterator;
+
+public:
+	UniqueAccessExpireStrategy()
+		/// Create an unique expire strategy.
+	{
+	}
+
+	~UniqueAccessExpireStrategy()
+	{
+	}
+
+	void onAdd(const void*, const KeyValueArgs <TKey, TValue>& args)
+	{
+		// the expire value defines how many millisecs in the future the
+		// value will expire, even insert negative values!
+		Timestamp expire;
+		expire += args.value().getTimeout().totalMicroseconds();
+		
+		IndexIterator it = _keyIndex.insert(std::make_pair(expire, std::make_pair(args.key(), args.value().getTimeout())));
+		std::pair<Iterator, bool> stat = _keys.insert(std::make_pair(args.key(), it));
+		if (!stat.second)
+		{
+			_keyIndex.erase(stat.first->second);
+			stat.first->second = it;
+		}
+	}
+
+	void onRemove(const void*, const TKey& key)
+	{
+		Iterator it = _keys.find(key);
+		if (it != _keys.end())
+		{
+			_keyIndex.erase(it->second);
+			_keys.erase(it);
+		}
+	}
+
+	void onGet(const void*, const TKey& key)
+	{
+		// get updates the expiration time stamp
+		Iterator it = _keys.find(key);
+		if (it != _keys.end())
+		{
+			KeyExpire ke = it->second->second;
+			// gen new absolute expire value
+			Timestamp expire;
+			expire += ke.second.totalMicroseconds();
+			// delete old index
+			_keyIndex.erase(it->second);
+			IndexIterator itt = _keyIndex.insert(std::make_pair(expire, ke));
+			// update iterator
+			it->second = itt;
+		}
+	}
+
+	void onClear(const void*, const EventArgs& args)
+	{
+		_keys.clear();
+		_keyIndex.clear();
+	}
+
+	void onIsValid(const void*, ValidArgs<TKey>& args)
+	{
+		Iterator it = _keys.find(args.key());
+		if (it != _keys.end())
+		{
+			Timestamp now;
+			if (it->second->first <= now)
+			{
+				args.invalidate();
+			}
+		}
+		else //not found: probably removed by onReplace
+			args.invalidate();
+	}
+
+	void onReplace(const void*, std::set<TKey>& elemsToRemove)
+	{
+		// Note: replace only informs the cache which elements
+		// it would like to remove!
+		// it does not remove them on its own!
+		IndexIterator it = _keyIndex.begin();
+		Timestamp now;
+		while (it != _keyIndex.end() && it->first < now)
+		{
+			elemsToRemove.insert(it->second.first);
+			++it;
+		}
+	}
+
+protected:
+	Keys      _keys;     /// For faster replacement of keys, the iterator points to the _keyIndex map
+	TimeIndex _keyIndex; /// Maps time to key value
+};
+
+
+} // namespace Poco
+
+#endif
diff --git a/Foundation/include/Poco/UniqueExpireCache.h b/Foundation/include/Poco/UniqueExpireCache.h
index 366af7d40..15e86d1d0 100644
--- a/Foundation/include/Poco/UniqueExpireCache.h
+++ b/Foundation/include/Poco/UniqueExpireCache.h
@@ -1,89 +1,89 @@
-//
-// UniqueExpireCache.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireCache.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  UniqueExpireCache
-//
-// Definition of the UniqueExpireCache class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_UniqueExpireCache_INCLUDED
-#define  Foundation_UniqueExpireCache_INCLUDED
-
-
-#include "Poco/AbstractCache.h"
-#include "Poco/UniqueExpireStrategy.h"
-
-
-namespace Poco {
-
-
-template <class TKey, class TValue> 
-class UniqueExpireCache: public AbstractCache<TKey, TValue, UniqueExpireStrategy<TKey, TValue> >
-	/// An UniqueExpireCache caches entries for a given time amount. In contrast
-	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define 
-	/// expiration per CacheEntry.
-	/// Each TValue object must thus offer the following method:
-	///    
-	///    const Poco::Timestamp& getExpiration() const;
-	///    
-	/// which returns the absolute timepoint when the entry will be invalidated.
-	/// Accessing an object will NOT update this absolute expire timepoint.
-	/// You can use the Poco::ExpirationDecorator to add the getExpiration
-	/// method to values that do not have a getExpiration function.
-	///
-	/// Be careful when using an UniqueExpireCache. A cache is often used
-	/// like cache.has(x) followed by cache.get x). Note that it could happen
-	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
-	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
-	/// when "get" is invoked.
-{
-public:
-	UniqueExpireCache():
-		AbstractCache<TKey, TValue, UniqueExpireStrategy<TKey, TValue> >(UniqueExpireStrategy<TKey, TValue>())
-	{
-	}
-
-	~UniqueExpireCache()
-	{
-	}
-
-private:
-	UniqueExpireCache(const UniqueExpireCache& aCache);
-	UniqueExpireCache& operator = (const UniqueExpireCache& aCache);
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// UniqueExpireCache.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireCache.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  UniqueExpireCache
+//
+// Definition of the UniqueExpireCache class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_UniqueExpireCache_INCLUDED
+#define  Foundation_UniqueExpireCache_INCLUDED
+
+
+#include "Poco/AbstractCache.h"
+#include "Poco/UniqueExpireStrategy.h"
+
+
+namespace Poco {
+
+
+template <class TKey, class TValue> 
+class UniqueExpireCache: public AbstractCache<TKey, TValue, UniqueExpireStrategy<TKey, TValue> >
+	/// An UniqueExpireCache caches entries for a given time amount. In contrast
+	/// to ExpireCache which only allows to set a per cache expiration value, it allows to define 
+	/// expiration per CacheEntry.
+	/// Each TValue object must thus offer the following method:
+	///    
+	///    const Poco::Timestamp& getExpiration() const;
+	///    
+	/// which returns the absolute timepoint when the entry will be invalidated.
+	/// Accessing an object will NOT update this absolute expire timepoint.
+	/// You can use the Poco::ExpirationDecorator to add the getExpiration
+	/// method to values that do not have a getExpiration function.
+	///
+	/// Be careful when using an UniqueExpireCache. A cache is often used
+	/// like cache.has(x) followed by cache.get x). Note that it could happen
+	/// that the "has" call works, then the current execution thread gets descheduled, time passes,
+	/// the entry gets invalid, thus leading to an empty SharedPtr being returned 
+	/// when "get" is invoked.
+{
+public:
+	UniqueExpireCache():
+		AbstractCache<TKey, TValue, UniqueExpireStrategy<TKey, TValue> >(UniqueExpireStrategy<TKey, TValue>())
+	{
+	}
+
+	~UniqueExpireCache()
+	{
+	}
+
+private:
+	UniqueExpireCache(const UniqueExpireCache& aCache);
+	UniqueExpireCache& operator = (const UniqueExpireCache& aCache);
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/UniqueExpireLRUCache.h b/Foundation/include/Poco/UniqueExpireLRUCache.h
index 63a328f90..01f2ce365 100644
--- a/Foundation/include/Poco/UniqueExpireLRUCache.h
+++ b/Foundation/include/Poco/UniqueExpireLRUCache.h
@@ -1,90 +1,90 @@
-//
-// UniqueExpireLRUCache.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireLRUCache.h#2 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  UniqueExpireLRUCache
-//
-// Definition of the UniqueExpireLRUCache class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_UniqueExpireLRUCache_INCLUDED
-#define  Foundation_UniqueExpireLRUCache_INCLUDED
-
-
-#include "Poco/AbstractCache.h"
-#include "Poco/StrategyCollection.h"
-#include "Poco/UniqueExpireStrategy.h"
-#include "Poco/LRUStrategy.h"
-
-
-namespace Poco {
-
-
-template < 
-	class TKey,
-	class TValue
->
-class UniqueExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >
-	/// A UniqueExpireLRUCache combines LRU caching and time based per entry expire caching.
-	/// One can define for each cache entry a seperate timepoint
-	/// but also limit the size of the cache (per default: 1024).
-	/// Each TValue object must thus offer the following method:
-	///    
-	///    const Poco::Timestamp& getExpiration() const;
-	///    
-	/// which returns the absolute timepoint when the entry will be invalidated.
-	/// Accessing an object will NOT update this absolute expire timepoint.
-	/// You can use the Poco::ExpirationDecorator to add the getExpiration
-	/// method to values that do not have a getExpiration function.
-{
-public:
-	UniqueExpireLRUCache(long cacheSize = 1024): 
-		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >(StrategyCollection<TKey, TValue>())
-	{
-		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
-		this->_strategy.pushBack(new UniqueExpireStrategy<TKey, TValue>());
-	}
-
-	~UniqueExpireLRUCache()
-	{
-	}
-
-private:
-	UniqueExpireLRUCache(const UniqueExpireLRUCache& aCache);
-	UniqueExpireLRUCache& operator = (const UniqueExpireLRUCache& aCache);
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// UniqueExpireLRUCache.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireLRUCache.h#2 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  UniqueExpireLRUCache
+//
+// Definition of the UniqueExpireLRUCache class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_UniqueExpireLRUCache_INCLUDED
+#define  Foundation_UniqueExpireLRUCache_INCLUDED
+
+
+#include "Poco/AbstractCache.h"
+#include "Poco/StrategyCollection.h"
+#include "Poco/UniqueExpireStrategy.h"
+#include "Poco/LRUStrategy.h"
+
+
+namespace Poco {
+
+
+template < 
+	class TKey,
+	class TValue
+>
+class UniqueExpireLRUCache: public AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >
+	/// A UniqueExpireLRUCache combines LRU caching and time based per entry expire caching.
+	/// One can define for each cache entry a seperate timepoint
+	/// but also limit the size of the cache (per default: 1024).
+	/// Each TValue object must thus offer the following method:
+	///    
+	///    const Poco::Timestamp& getExpiration() const;
+	///    
+	/// which returns the absolute timepoint when the entry will be invalidated.
+	/// Accessing an object will NOT update this absolute expire timepoint.
+	/// You can use the Poco::ExpirationDecorator to add the getExpiration
+	/// method to values that do not have a getExpiration function.
+{
+public:
+	UniqueExpireLRUCache(long cacheSize = 1024): 
+		AbstractCache<TKey, TValue, StrategyCollection<TKey, TValue> >(StrategyCollection<TKey, TValue>())
+	{
+		this->_strategy.pushBack(new LRUStrategy<TKey, TValue>(cacheSize));
+		this->_strategy.pushBack(new UniqueExpireStrategy<TKey, TValue>());
+	}
+
+	~UniqueExpireLRUCache()
+	{
+	}
+
+private:
+	UniqueExpireLRUCache(const UniqueExpireLRUCache& aCache);
+	UniqueExpireLRUCache& operator = (const UniqueExpireLRUCache& aCache);
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/UniqueExpireStrategy.h b/Foundation/include/Poco/UniqueExpireStrategy.h
index b5017799d..137642c77 100644
--- a/Foundation/include/Poco/UniqueExpireStrategy.h
+++ b/Foundation/include/Poco/UniqueExpireStrategy.h
@@ -1,160 +1,160 @@
-//
-// UniqueExpireStrategy.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireStrategy.h#3 $
-//
-// Library: Foundation
-// Package: Cache
-// Module:  UniqueExpireStrategy
-//
-// Definition of the UniqueExpireStrategy class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef  Foundation_UniqueExpireStrategy_INCLUDED
-#define  Foundation_UniqueExpireStrategy_INCLUDED
-
-
-#include "Poco/KeyValueArgs.h"
-#include "Poco/ValidArgs.h"
-#include "Poco/AbstractStrategy.h"
-#include "Poco/Bugcheck.h"
-#include "Poco/Timestamp.h"
-#include "Poco/EventArgs.h"
-#include <set>
-#include <map>
-
-
-namespace Poco {
-
-
-template < 
-	class TKey,
-	class TValue
->
-class UniqueExpireStrategy: public AbstractStrategy<TKey, TValue>
-	/// An UniqueExpireStrategy implements time based expiration of cache entries. In contrast
-	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define 
-	/// expiration per CacheEntry.
-	/// Each TValue object must thus offer the following method:
-	///    
-	///    const Poco::Timestamp& getExpiration() const;
-	///    
-	/// which returns the absolute timepoint when the entry will be invalidated.
-{
-public:
-	typedef std::multimap<Timestamp, TKey>     TimeIndex;
-	typedef typename TimeIndex::iterator       IndexIterator;
-	typedef typename TimeIndex::const_iterator ConstIndexIterator;
-	typedef std::map<TKey, IndexIterator>      Keys;
-	typedef typename Keys::iterator            Iterator;
-
-public:
-	UniqueExpireStrategy()
-		/// Create an unique expire strategy.
-	{
-	}
-
-	~UniqueExpireStrategy()
-	{
-	}
-
-	void onAdd(const void*, const KeyValueArgs <TKey, TValue>& args)
-	{
-		// note: we have to insert even if the expire timepoint is in the past (for StrategyCollection classes to avoid inconsistency with LRU)
-		// no problem: will be removed with next get
-		const Timestamp& expire = args.value().getExpiration();
-		IndexIterator it = _keyIndex.insert(std::make_pair(expire, args.key()));
-		std::pair<Iterator, bool> stat = _keys.insert(std::make_pair(args.key(), it));
-		if (!stat.second)
-		{
-			_keyIndex.erase(stat.first->second);
-			stat.first->second = it;
-		}
-	}
-
-	void onRemove(const void*, const TKey& key)
-	{
-		Iterator it = _keys.find(key);
-		if (it != _keys.end())
-		{
-			_keyIndex.erase(it->second);
-			_keys.erase(it);
-		}
-	}
-
-	void onGet(const void*, const TKey& key)
-	{
-		// get triggers no changes in an expire
-	}
-
-	void onClear(const void*, const EventArgs& args)
-	{
-		_keys.clear();
-		_keyIndex.clear();
-	}
-
-	void onIsValid(const void*, ValidArgs<TKey>& args)
-	{
-		Iterator it = _keys.find(args.key());
-		if (it != _keys.end())
-		{
-			Timestamp now;
-			if (it->second->first <= now)
-			{
-				args.invalidate();
-			}
-		}
-		else //not found: probably removed by onReplace
-			args.invalidate();
-	}
-
-	void onReplace(const void*, std::set<TKey>& elemsToRemove)
-	{
-		// Note: replace only informs the cache which elements
-		// it would like to remove!
-		// it does not remove them on its own!
-		IndexIterator it = _keyIndex.begin();
-		Timestamp now;
-		while (it != _keyIndex.end() && it->first < now)
-		{
-			elemsToRemove.insert(it->second);
-			++it;
-		}
-	}
-
-protected:
-	Keys      _keys;     /// For faster replacement of keys, the iterator points to the _keyIndex map
-	TimeIndex _keyIndex; /// Maps time to key value
-};
-
-
-} // namespace Poco
-
-
-#endif
+//
+// UniqueExpireStrategy.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/UniqueExpireStrategy.h#3 $
+//
+// Library: Foundation
+// Package: Cache
+// Module:  UniqueExpireStrategy
+//
+// Definition of the UniqueExpireStrategy class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef  Foundation_UniqueExpireStrategy_INCLUDED
+#define  Foundation_UniqueExpireStrategy_INCLUDED
+
+
+#include "Poco/KeyValueArgs.h"
+#include "Poco/ValidArgs.h"
+#include "Poco/AbstractStrategy.h"
+#include "Poco/Bugcheck.h"
+#include "Poco/Timestamp.h"
+#include "Poco/EventArgs.h"
+#include <set>
+#include <map>
+
+
+namespace Poco {
+
+
+template < 
+	class TKey,
+	class TValue
+>
+class UniqueExpireStrategy: public AbstractStrategy<TKey, TValue>
+	/// An UniqueExpireStrategy implements time based expiration of cache entries. In contrast
+	/// to ExpireStrategy which only allows to set a per cache expiration value, it allows to define 
+	/// expiration per CacheEntry.
+	/// Each TValue object must thus offer the following method:
+	///    
+	///    const Poco::Timestamp& getExpiration() const;
+	///    
+	/// which returns the absolute timepoint when the entry will be invalidated.
+{
+public:
+	typedef std::multimap<Timestamp, TKey>     TimeIndex;
+	typedef typename TimeIndex::iterator       IndexIterator;
+	typedef typename TimeIndex::const_iterator ConstIndexIterator;
+	typedef std::map<TKey, IndexIterator>      Keys;
+	typedef typename Keys::iterator            Iterator;
+
+public:
+	UniqueExpireStrategy()
+		/// Create an unique expire strategy.
+	{
+	}
+
+	~UniqueExpireStrategy()
+	{
+	}
+
+	void onAdd(const void*, const KeyValueArgs <TKey, TValue>& args)
+	{
+		// note: we have to insert even if the expire timepoint is in the past (for StrategyCollection classes to avoid inconsistency with LRU)
+		// no problem: will be removed with next get
+		const Timestamp& expire = args.value().getExpiration();
+		IndexIterator it = _keyIndex.insert(std::make_pair(expire, args.key()));
+		std::pair<Iterator, bool> stat = _keys.insert(std::make_pair(args.key(), it));
+		if (!stat.second)
+		{
+			_keyIndex.erase(stat.first->second);
+			stat.first->second = it;
+		}
+	}
+
+	void onRemove(const void*, const TKey& key)
+	{
+		Iterator it = _keys.find(key);
+		if (it != _keys.end())
+		{
+			_keyIndex.erase(it->second);
+			_keys.erase(it);
+		}
+	}
+
+	void onGet(const void*, const TKey& key)
+	{
+		// get triggers no changes in an expire
+	}
+
+	void onClear(const void*, const EventArgs& args)
+	{
+		_keys.clear();
+		_keyIndex.clear();
+	}
+
+	void onIsValid(const void*, ValidArgs<TKey>& args)
+	{
+		Iterator it = _keys.find(args.key());
+		if (it != _keys.end())
+		{
+			Timestamp now;
+			if (it->second->first <= now)
+			{
+				args.invalidate();
+			}
+		}
+		else //not found: probably removed by onReplace
+			args.invalidate();
+	}
+
+	void onReplace(const void*, std::set<TKey>& elemsToRemove)
+	{
+		// Note: replace only informs the cache which elements
+		// it would like to remove!
+		// it does not remove them on its own!
+		IndexIterator it = _keyIndex.begin();
+		Timestamp now;
+		while (it != _keyIndex.end() && it->first < now)
+		{
+			elemsToRemove.insert(it->second);
+			++it;
+		}
+	}
+
+protected:
+	Keys      _keys;     /// For faster replacement of keys, the iterator points to the _keyIndex map
+	TimeIndex _keyIndex; /// Maps time to key value
+};
+
+
+} // namespace Poco
+
+
+#endif
diff --git a/Foundation/include/Poco/WindowsConsoleChannel.h b/Foundation/include/Poco/WindowsConsoleChannel.h
index 080ac9e52..83ff4254a 100644
--- a/Foundation/include/Poco/WindowsConsoleChannel.h
+++ b/Foundation/include/Poco/WindowsConsoleChannel.h
@@ -1,89 +1,89 @@
-//
-// WindowsConsoleChannel.h
-//
-// $Id: //poco/svn/Foundation/include/Poco/WindowsConsoleChannel.h#2 $
-//
-// Library: Foundation
-// Package: Logging
-// Module:  WindowsConsoleChannel
-//
-// Definition of the WindowsConsoleChannel class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Foundation_WindowsConsoleChannel_INCLUDED
-#define Foundation_WindowsConsoleChannel_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/Channel.h"
-#include "Poco/Mutex.h"
-#include "Poco/UnWindows.h"
-
-
-namespace Poco {
-
-
-class Foundation_API WindowsConsoleChannel: public Channel
-	/// A channel that writes to the Windows console.
-	///
-	/// Only the message's text is written, followed
-	/// by a newline.
-	///
-	/// If POCO has been compiled with POCO_WIN32_UTF8,
-	/// log messages are assumed to be UTF-8 encoded, and
-	/// are converted to UTF-16 prior to writing them to the
-	/// console. This is the main difference to the ConsoleChannel
-	/// class, which cannot handle UTF-8 encoded messages on Windows.
-	///
-	/// Chain this channel to a FormattingChannel with an
-	/// appropriate Formatter to control what is contained 
-	/// in the text.
-	///
-	/// Only available on Windows platforms.
-{
-public:
-	WindowsConsoleChannel();
-		/// Creates the WindowsConsoleChannel.
-
-	void log(const Message& msg);
-		/// Logs the given message to the channel's stream.
-		
-protected:
-	~WindowsConsoleChannel();
-
-private:
-	HANDLE _hConsole;
-	bool   _isFile;
-};
-
-
-} // namespace Poco
-
-
-#endif // Foundation_WindowsConsoleChannel_INCLUDED
+//
+// WindowsConsoleChannel.h
+//
+// $Id: //poco/svn/Foundation/include/Poco/WindowsConsoleChannel.h#2 $
+//
+// Library: Foundation
+// Package: Logging
+// Module:  WindowsConsoleChannel
+//
+// Definition of the WindowsConsoleChannel class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Foundation_WindowsConsoleChannel_INCLUDED
+#define Foundation_WindowsConsoleChannel_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/Channel.h"
+#include "Poco/Mutex.h"
+#include "Poco/UnWindows.h"
+
+
+namespace Poco {
+
+
+class Foundation_API WindowsConsoleChannel: public Channel
+	/// A channel that writes to the Windows console.
+	///
+	/// Only the message's text is written, followed
+	/// by a newline.
+	///
+	/// If POCO has been compiled with POCO_WIN32_UTF8,
+	/// log messages are assumed to be UTF-8 encoded, and
+	/// are converted to UTF-16 prior to writing them to the
+	/// console. This is the main difference to the ConsoleChannel
+	/// class, which cannot handle UTF-8 encoded messages on Windows.
+	///
+	/// Chain this channel to a FormattingChannel with an
+	/// appropriate Formatter to control what is contained 
+	/// in the text.
+	///
+	/// Only available on Windows platforms.
+{
+public:
+	WindowsConsoleChannel();
+		/// Creates the WindowsConsoleChannel.
+
+	void log(const Message& msg);
+		/// Logs the given message to the channel's stream.
+		
+protected:
+	~WindowsConsoleChannel();
+
+private:
+	HANDLE _hConsole;
+	bool   _isFile;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_WindowsConsoleChannel_INCLUDED
diff --git a/Foundation/src/AsyncIOChannel.cpp b/Foundation/src/AsyncIOChannel.cpp
index 4c9ea2194..e942622c7 100644
--- a/Foundation/src/AsyncIOChannel.cpp
+++ b/Foundation/src/AsyncIOChannel.cpp
@@ -1,79 +1,79 @@
-//
-// AsyncIOChannel.cpp
-//
-// $Id: //poco/svn/Foundation/src/AsyncIOChannel.cpp#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncIOChannel
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/AsyncIOChannel.h"
-
-
-namespace Poco {
-
-
-AsyncIOChannel::AsyncIOChannel():
-	enqueue(this, &AsyncIOChannel::enqueueImpl)
-{
-}
-
-
-AsyncIOChannel::~AsyncIOChannel()
-{
-}
-
-
-int AsyncIOChannel::enqueueImpl(const AsyncIOCommand::Ptr& pCommand)
-{
-	AsyncIOCommand::Ptr ptr(pCommand);
-	return ptr->execute(*this);
-}
-
-
-int AsyncIOChannel::write(const void* buffer, int length)
-{
-	throw NotImplementedException("write()");
-}
-
-	
-int AsyncIOChannel::read(void* buffer, int length)
-{
-	throw NotImplementedException("read()");
-}
-
-	
-int AsyncIOChannel::seek(std::streamoff off, std::ios::seekdir dir)
-{
-	throw NotImplementedException("seek()");
-}
-
-
-} // namespace Poco
+//
+// AsyncIOChannel.cpp
+//
+// $Id: //poco/svn/Foundation/src/AsyncIOChannel.cpp#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncIOChannel
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/AsyncIOChannel.h"
+
+
+namespace Poco {
+
+
+AsyncIOChannel::AsyncIOChannel():
+	enqueue(this, &AsyncIOChannel::enqueueImpl)
+{
+}
+
+
+AsyncIOChannel::~AsyncIOChannel()
+{
+}
+
+
+int AsyncIOChannel::enqueueImpl(const AsyncIOCommand::Ptr& pCommand)
+{
+	AsyncIOCommand::Ptr ptr(pCommand);
+	return ptr->execute(*this);
+}
+
+
+int AsyncIOChannel::write(const void* buffer, int length)
+{
+	throw NotImplementedException("write()");
+}
+
+	
+int AsyncIOChannel::read(void* buffer, int length)
+{
+	throw NotImplementedException("read()");
+}
+
+	
+int AsyncIOChannel::seek(std::streamoff off, std::ios::seekdir dir)
+{
+	throw NotImplementedException("seek()");
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/AsyncIOCommand.cpp b/Foundation/src/AsyncIOCommand.cpp
index e097d4f21..c68b4464a 100644
--- a/Foundation/src/AsyncIOCommand.cpp
+++ b/Foundation/src/AsyncIOCommand.cpp
@@ -1,236 +1,236 @@
-//
-// AsyncIOCommand.cpp
-//
-// $Id: //poco/svn/Foundation/src/AsyncIOCommand.cpp#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncIOCommand
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/AsyncIOCommand.h"
-#include "Poco/AsyncIOChannel.h"
-#include "Poco/AsyncIOEvent.h"
-#include <cstring>
-
-
-namespace Poco {
-
-
-//
-// AsyncIOCommand
-//
-
-
-AsyncIOCommand::AsyncIOCommand():
-	_state(CMD_PENDING),
-	_result(0),
-	_pException(0)
-{
-}
-
-	
-AsyncIOCommand::~AsyncIOCommand()
-{
-	delete _pException;
-}
-
-
-void AsyncIOCommand::wait()
-{
-	_completed.wait();
-}
-
-
-void AsyncIOCommand::wait(long milliseconds)
-{
-	_completed.wait(milliseconds);
-}
-
-	
-bool AsyncIOCommand::tryWait(long milliseconds)
-{
-	return _completed.tryWait(milliseconds);
-}
-
-
-int AsyncIOCommand::execute(AsyncIOChannel& channel)
-{
-	delete _pException;
-	_pException = 0;
-
-	_state = CMD_IN_PROGRESS;
-	try
-	{
-		_result = executeImpl(channel);
-		_state = CMD_COMPLETED;
-		_completed.set();
-		AsyncIOEvent completedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_COMPLETED);
-		commandCompleted(this, completedEvent);
-		channel.commandCompleted(this, completedEvent);
-		return _result;
-	}
-	catch (Exception& exc)
-	{
-		_pException = exc.clone();
-		_state = CMD_FAILED;
-		_completed.set();
-		AsyncIOEvent failedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_FAILED);
-		commandFailed(this, failedEvent);
-		channel.commandFailed(this, failedEvent);
-		throw;
-	}
-	catch (std::exception& exc)
-	{
-		_pException = new Exception(exc.what());
-		_state = CMD_FAILED;
-		_completed.set();
-		AsyncIOEvent failedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_FAILED);
-		commandFailed(this, failedEvent);
-		channel.commandFailed(this, failedEvent);
-		throw;
-	}
-	catch (...)
-	{
-		_pException = new Exception("Unknown exception");
-		_state = CMD_FAILED;
-		_completed.set();
-		AsyncIOEvent failedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_FAILED);
-		commandFailed(this, failedEvent);
-		channel.commandFailed(this, failedEvent);
-		throw;
-	}
-}
-
-
-//
-// AsyncWriteCommand
-//
-
-
-AsyncWriteCommand::AsyncWriteCommand(const void* buffer, int length):
-	_buffer(buffer),
-	_length(length)
-{
-}
-
-
-AsyncWriteCommand::~AsyncWriteCommand()
-{
-}
-
-
-int AsyncWriteCommand::executeImpl(AsyncIOChannel& channel)
-{
-	return channel.write(_buffer, _length);
-}
-
-
-//
-// AsyncBufferedWriteCommand
-//
-
-
-AsyncBufferedWriteCommand::AsyncBufferedWriteCommand(const void* buf, int length):
-	AsyncWriteCommand(new char[length], length)
-{
-	std::memcpy(const_cast<void*>(buffer()), buf, length);
-}
-
-
-AsyncBufferedWriteCommand::~AsyncBufferedWriteCommand()
-{
-	delete [] reinterpret_cast<const char*>(buffer());
-}
-
-
-//
-// AsyncReadCommand
-//
-
-
-AsyncReadCommand::AsyncReadCommand(void* buffer, int length):
-	_buffer(buffer),
-	_length(length)
-{
-}
-
-
-AsyncReadCommand::~AsyncReadCommand()
-{
-}
-
-
-int AsyncReadCommand::executeImpl(AsyncIOChannel& channel)
-{
-	return channel.read(_buffer, _length);
-}
-
-
-//
-// AsyncBufferedReadCommand
-//
-
-
-AsyncBufferedReadCommand::AsyncBufferedReadCommand(int length):
-	AsyncReadCommand(new char[length], length)
-{
-}
-
-
-AsyncBufferedReadCommand::~AsyncBufferedReadCommand()
-{
-	delete [] reinterpret_cast<char*>(buffer());
-}
-
-
-//
-// AsyncSeekCommand
-//
-
-
-AsyncSeekCommand::AsyncSeekCommand(std::streamoff off, std::ios::seekdir dir):
-	_off(off),
-	_dir(dir)
-{
-}
-
-
-AsyncSeekCommand::~AsyncSeekCommand()
-{
-}
-
-
-int AsyncSeekCommand::executeImpl(AsyncIOChannel& channel)
-{
-	return channel.seek(_off, _dir);
-}
-
-
-} // namespace Poco
+//
+// AsyncIOCommand.cpp
+//
+// $Id: //poco/svn/Foundation/src/AsyncIOCommand.cpp#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncIOCommand
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/AsyncIOCommand.h"
+#include "Poco/AsyncIOChannel.h"
+#include "Poco/AsyncIOEvent.h"
+#include <cstring>
+
+
+namespace Poco {
+
+
+//
+// AsyncIOCommand
+//
+
+
+AsyncIOCommand::AsyncIOCommand():
+	_state(CMD_PENDING),
+	_result(0),
+	_pException(0)
+{
+}
+
+	
+AsyncIOCommand::~AsyncIOCommand()
+{
+	delete _pException;
+}
+
+
+void AsyncIOCommand::wait()
+{
+	_completed.wait();
+}
+
+
+void AsyncIOCommand::wait(long milliseconds)
+{
+	_completed.wait(milliseconds);
+}
+
+	
+bool AsyncIOCommand::tryWait(long milliseconds)
+{
+	return _completed.tryWait(milliseconds);
+}
+
+
+int AsyncIOCommand::execute(AsyncIOChannel& channel)
+{
+	delete _pException;
+	_pException = 0;
+
+	_state = CMD_IN_PROGRESS;
+	try
+	{
+		_result = executeImpl(channel);
+		_state = CMD_COMPLETED;
+		_completed.set();
+		AsyncIOEvent completedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_COMPLETED);
+		commandCompleted(this, completedEvent);
+		channel.commandCompleted(this, completedEvent);
+		return _result;
+	}
+	catch (Exception& exc)
+	{
+		_pException = exc.clone();
+		_state = CMD_FAILED;
+		_completed.set();
+		AsyncIOEvent failedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_FAILED);
+		commandFailed(this, failedEvent);
+		channel.commandFailed(this, failedEvent);
+		throw;
+	}
+	catch (std::exception& exc)
+	{
+		_pException = new Exception(exc.what());
+		_state = CMD_FAILED;
+		_completed.set();
+		AsyncIOEvent failedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_FAILED);
+		commandFailed(this, failedEvent);
+		channel.commandFailed(this, failedEvent);
+		throw;
+	}
+	catch (...)
+	{
+		_pException = new Exception("Unknown exception");
+		_state = CMD_FAILED;
+		_completed.set();
+		AsyncIOEvent failedEvent(this, &channel, AsyncIOEvent::EV_COMMAND_FAILED);
+		commandFailed(this, failedEvent);
+		channel.commandFailed(this, failedEvent);
+		throw;
+	}
+}
+
+
+//
+// AsyncWriteCommand
+//
+
+
+AsyncWriteCommand::AsyncWriteCommand(const void* buffer, int length):
+	_buffer(buffer),
+	_length(length)
+{
+}
+
+
+AsyncWriteCommand::~AsyncWriteCommand()
+{
+}
+
+
+int AsyncWriteCommand::executeImpl(AsyncIOChannel& channel)
+{
+	return channel.write(_buffer, _length);
+}
+
+
+//
+// AsyncBufferedWriteCommand
+//
+
+
+AsyncBufferedWriteCommand::AsyncBufferedWriteCommand(const void* buf, int length):
+	AsyncWriteCommand(new char[length], length)
+{
+	std::memcpy(const_cast<void*>(buffer()), buf, length);
+}
+
+
+AsyncBufferedWriteCommand::~AsyncBufferedWriteCommand()
+{
+	delete [] reinterpret_cast<const char*>(buffer());
+}
+
+
+//
+// AsyncReadCommand
+//
+
+
+AsyncReadCommand::AsyncReadCommand(void* buffer, int length):
+	_buffer(buffer),
+	_length(length)
+{
+}
+
+
+AsyncReadCommand::~AsyncReadCommand()
+{
+}
+
+
+int AsyncReadCommand::executeImpl(AsyncIOChannel& channel)
+{
+	return channel.read(_buffer, _length);
+}
+
+
+//
+// AsyncBufferedReadCommand
+//
+
+
+AsyncBufferedReadCommand::AsyncBufferedReadCommand(int length):
+	AsyncReadCommand(new char[length], length)
+{
+}
+
+
+AsyncBufferedReadCommand::~AsyncBufferedReadCommand()
+{
+	delete [] reinterpret_cast<char*>(buffer());
+}
+
+
+//
+// AsyncSeekCommand
+//
+
+
+AsyncSeekCommand::AsyncSeekCommand(std::streamoff off, std::ios::seekdir dir):
+	_off(off),
+	_dir(dir)
+{
+}
+
+
+AsyncSeekCommand::~AsyncSeekCommand()
+{
+}
+
+
+int AsyncSeekCommand::executeImpl(AsyncIOChannel& channel)
+{
+	return channel.seek(_off, _dir);
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/AsyncIOEvent.cpp b/Foundation/src/AsyncIOEvent.cpp
index 48a70dfd7..5299c237c 100644
--- a/Foundation/src/AsyncIOEvent.cpp
+++ b/Foundation/src/AsyncIOEvent.cpp
@@ -1,88 +1,88 @@
-//
-// AsyncIOEvent.cpp
-//
-// $Id: //poco/svn/Foundation/src/AsyncIOEvent.cpp#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncIOEvent
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/AsyncIOEvent.h"
-#include "Poco/AsyncIOCommand.h"
-#include <algorithm>
-
-
-namespace Poco {
-
-
-AsyncIOEvent::AsyncIOEvent(AsyncIOCommand* pCommand, AsyncIOChannel* pChannel, EventKind what):
-	_pCommand(pCommand),
-	_pChannel(pChannel),
-	_what(what)
-{
-	poco_check_ptr (pCommand);
-	poco_check_ptr (pChannel);
-	
-	_pCommand->duplicate();
-}
-
-
-AsyncIOEvent::AsyncIOEvent(const AsyncIOEvent& event):
-	_pCommand(event._pCommand),
-	_pChannel(event._pChannel),
-	_what(event._what)
-{
-	_pCommand->duplicate();
-}
-
-
-AsyncIOEvent::~AsyncIOEvent()
-{
-	_pCommand->release();
-}
-
-	
-AsyncIOEvent& AsyncIOEvent::operator = (const AsyncIOEvent& event)
-{
-	AsyncIOEvent tmp(event);
-	swap(tmp);
-	return *this;
-}		
-
-
-void AsyncIOEvent::swap(AsyncIOEvent& event)
-{
-	std::swap(_pCommand, event._pCommand);
-	std::swap(_pChannel, event._pChannel);
-	std::swap(_what, event._what);
-}
-
-
-} // namespace Poco
+//
+// AsyncIOEvent.cpp
+//
+// $Id: //poco/svn/Foundation/src/AsyncIOEvent.cpp#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncIOEvent
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/AsyncIOEvent.h"
+#include "Poco/AsyncIOCommand.h"
+#include <algorithm>
+
+
+namespace Poco {
+
+
+AsyncIOEvent::AsyncIOEvent(AsyncIOCommand* pCommand, AsyncIOChannel* pChannel, EventKind what):
+	_pCommand(pCommand),
+	_pChannel(pChannel),
+	_what(what)
+{
+	poco_check_ptr (pCommand);
+	poco_check_ptr (pChannel);
+	
+	_pCommand->duplicate();
+}
+
+
+AsyncIOEvent::AsyncIOEvent(const AsyncIOEvent& event):
+	_pCommand(event._pCommand),
+	_pChannel(event._pChannel),
+	_what(event._what)
+{
+	_pCommand->duplicate();
+}
+
+
+AsyncIOEvent::~AsyncIOEvent()
+{
+	_pCommand->release();
+}
+
+	
+AsyncIOEvent& AsyncIOEvent::operator = (const AsyncIOEvent& event)
+{
+	AsyncIOEvent tmp(event);
+	swap(tmp);
+	return *this;
+}		
+
+
+void AsyncIOEvent::swap(AsyncIOEvent& event)
+{
+	std::swap(_pCommand, event._pCommand);
+	std::swap(_pChannel, event._pChannel);
+	std::swap(_what, event._what);
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/AsyncStreamChannel.cpp b/Foundation/src/AsyncStreamChannel.cpp
index 54f8ab620..d7bf42227 100644
--- a/Foundation/src/AsyncStreamChannel.cpp
+++ b/Foundation/src/AsyncStreamChannel.cpp
@@ -1,100 +1,100 @@
-//
-// AsyncStreamChannel.cpp
-//
-// $Id: //poco/svn/Foundation/src/AsyncStreamChannel.cpp#2 $
-//
-// Library: Foundation
-// Package: AsyncIO
-// Module:  AsyncStreamChannel
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/AsyncStreamChannel.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-
-
-AsyncStreamChannel::AsyncStreamChannel(std::istream& istr):
-	_pIstr(&istr),
-	_pOstr(0)
-{
-}
-
-
-AsyncStreamChannel::AsyncStreamChannel(std::ostream& ostr):
-	_pIstr(0),
-	_pOstr(&ostr)
-{
-}
-
-
-AsyncStreamChannel::AsyncStreamChannel(std::iostream& iostr):
-	_pIstr(&iostr),
-	_pOstr(&iostr)
-{
-}
-
-
-AsyncStreamChannel::~AsyncStreamChannel()
-{
-}
-
-
-int AsyncStreamChannel::write(const void* buffer, int length)
-{
-	if (_pOstr)
-	{
-		_pOstr->write(reinterpret_cast<const char*>(buffer), length);
-		return length;
-	}
-	else throw IOException("Cannot write to an input stream");
-}
-
-
-int AsyncStreamChannel::read(void* buffer, int length)
-{
-	if (_pIstr)
-		return static_cast<int>(_pIstr->read(reinterpret_cast<char*>(buffer), length).gcount());
-	else
-		throw IOException("Cannot read from an output stream");
-}
-
-
-int AsyncStreamChannel::seek(std::streamoff off, std::ios::seekdir dir)
-{
-	if (_pIstr)
-		_pIstr->seekg(off, dir);
-	if (_pOstr)
-		_pOstr->seekp(off, dir);
-	return 0;
-}
-
-
-} // namespace Poco
+//
+// AsyncStreamChannel.cpp
+//
+// $Id: //poco/svn/Foundation/src/AsyncStreamChannel.cpp#2 $
+//
+// Library: Foundation
+// Package: AsyncIO
+// Module:  AsyncStreamChannel
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/AsyncStreamChannel.h"
+#include "Poco/Exception.h"
+
+
+namespace Poco {
+
+
+AsyncStreamChannel::AsyncStreamChannel(std::istream& istr):
+	_pIstr(&istr),
+	_pOstr(0)
+{
+}
+
+
+AsyncStreamChannel::AsyncStreamChannel(std::ostream& ostr):
+	_pIstr(0),
+	_pOstr(&ostr)
+{
+}
+
+
+AsyncStreamChannel::AsyncStreamChannel(std::iostream& iostr):
+	_pIstr(&iostr),
+	_pOstr(&iostr)
+{
+}
+
+
+AsyncStreamChannel::~AsyncStreamChannel()
+{
+}
+
+
+int AsyncStreamChannel::write(const void* buffer, int length)
+{
+	if (_pOstr)
+	{
+		_pOstr->write(reinterpret_cast<const char*>(buffer), length);
+		return length;
+	}
+	else throw IOException("Cannot write to an input stream");
+}
+
+
+int AsyncStreamChannel::read(void* buffer, int length)
+{
+	if (_pIstr)
+		return static_cast<int>(_pIstr->read(reinterpret_cast<char*>(buffer), length).gcount());
+	else
+		throw IOException("Cannot read from an output stream");
+}
+
+
+int AsyncStreamChannel::seek(std::streamoff off, std::ios::seekdir dir)
+{
+	if (_pIstr)
+		_pIstr->seekg(off, dir);
+	if (_pOstr)
+		_pOstr->seekp(off, dir);
+	return 0;
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/Checksum.cpp b/Foundation/src/Checksum.cpp
index 719a2d724..d4156a0e3 100644
--- a/Foundation/src/Checksum.cpp
+++ b/Foundation/src/Checksum.cpp
@@ -1,76 +1,76 @@
-//
-// Checksum.cpp
-//
-// $Id: //poco/svn/Foundation/src/Checksum.cpp#2 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  Checksum
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Checksum.h"
-#include "Poco/zlib.h"
-
-
-namespace Poco {
-
-
-Checksum::Checksum():
-	_type(TYPE_CRC32),
-	_value(crc32(0L, Z_NULL, 0))
-{
-}
-
-
-Checksum::Checksum(Type t):
-	_type(t),
-	_value(0)
-{
-	if (t == TYPE_CRC32)
-		_value = crc32(0L, Z_NULL, 0);
-	else
-		_value = adler32(0L, Z_NULL, 0);
-}
-
-
-Checksum::~Checksum()
-{
-}
-
-
-void Checksum::update(const char* data, unsigned length)
-{
-	if (_type == TYPE_ADLER32)
-		_value = adler32(_value, reinterpret_cast<const Bytef*>(data), length);
-	else
-		_value = crc32(_value, reinterpret_cast<const Bytef*>(data), length);
-}
-
-
-} // namespace Poco
+//
+// Checksum.cpp
+//
+// $Id: //poco/svn/Foundation/src/Checksum.cpp#2 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  Checksum
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Checksum.h"
+#include "Poco/zlib.h"
+
+
+namespace Poco {
+
+
+Checksum::Checksum():
+	_type(TYPE_CRC32),
+	_value(crc32(0L, Z_NULL, 0))
+{
+}
+
+
+Checksum::Checksum(Type t):
+	_type(t),
+	_value(0)
+{
+	if (t == TYPE_CRC32)
+		_value = crc32(0L, Z_NULL, 0);
+	else
+		_value = adler32(0L, Z_NULL, 0);
+}
+
+
+Checksum::~Checksum()
+{
+}
+
+
+void Checksum::update(const char* data, unsigned length)
+{
+	if (_type == TYPE_ADLER32)
+		_value = adler32(_value, reinterpret_cast<const Bytef*>(data), length);
+	else
+		_value = crc32(_value, reinterpret_cast<const Bytef*>(data), length);
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/Condition.cpp b/Foundation/src/Condition.cpp
index 6702cd3ae..c653580ad 100644
--- a/Foundation/src/Condition.cpp
+++ b/Foundation/src/Condition.cpp
@@ -1,101 +1,101 @@
-//
-// Condition.cpp
-//
-// $Id: //poco/svn/Foundation/src/Condition.cpp#2 $
-//
-// Library: Foundation
-// Package: Threading
-// Module:  Condition
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Condition.h"
-
-
-namespace Poco {
-
-
-Condition::Condition()
-{
-}
-
-Condition::~Condition()
-{
-}
-
-
-void Condition::signal()
-{
-	FastMutex::ScopedLock lock(_mutex);
-	
-	if (!_waitQueue.empty())
-	{
-		_waitQueue.front()->set();
-		dequeue();
-	}
-}
-
-
-void Condition::broadcast()
-{
-	FastMutex::ScopedLock lock(_mutex);
-	
-	for (WaitQueue::iterator it = _waitQueue.begin(); it != _waitQueue.end(); ++it)
-	{
-		(*it)->set();
-	}
-	_waitQueue.clear();
-}
-
-
-void Condition::enqueue(Event& event)
-{
-	_waitQueue.push_back(&event);
-}
-
-
-void Condition::dequeue()
-{
-	_waitQueue.pop_front();
-}
-
-
-void Condition::dequeue(Event& event)
-{
-	for (WaitQueue::iterator it = _waitQueue.begin(); it != _waitQueue.end(); ++it)
-	{
-		if (*it == &event)
-		{
-			_waitQueue.erase(it);
-			break;
-		}
-	}
-}
-
-
-} // namespace Poco
+//
+// Condition.cpp
+//
+// $Id: //poco/svn/Foundation/src/Condition.cpp#2 $
+//
+// Library: Foundation
+// Package: Threading
+// Module:  Condition
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Condition.h"
+
+
+namespace Poco {
+
+
+Condition::Condition()
+{
+}
+
+Condition::~Condition()
+{
+}
+
+
+void Condition::signal()
+{
+	FastMutex::ScopedLock lock(_mutex);
+	
+	if (!_waitQueue.empty())
+	{
+		_waitQueue.front()->set();
+		dequeue();
+	}
+}
+
+
+void Condition::broadcast()
+{
+	FastMutex::ScopedLock lock(_mutex);
+	
+	for (WaitQueue::iterator it = _waitQueue.begin(); it != _waitQueue.end(); ++it)
+	{
+		(*it)->set();
+	}
+	_waitQueue.clear();
+}
+
+
+void Condition::enqueue(Event& event)
+{
+	_waitQueue.push_back(&event);
+}
+
+
+void Condition::dequeue()
+{
+	_waitQueue.pop_front();
+}
+
+
+void Condition::dequeue(Event& event)
+{
+	for (WaitQueue::iterator it = _waitQueue.begin(); it != _waitQueue.end(); ++it)
+	{
+		if (*it == &event)
+		{
+			_waitQueue.erase(it);
+			break;
+		}
+	}
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/DynamicAny.cpp b/Foundation/src/DynamicAny.cpp
index d9fb10d89..104f91141 100644
--- a/Foundation/src/DynamicAny.cpp
+++ b/Foundation/src/DynamicAny.cpp
@@ -1,408 +1,408 @@
-//
-// DynamicAny.cpp
-//
-// $Id: //poco/svn/Foundation/src/DynamicAny.cpp#3 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  DynamicAny
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/DynamicAny.h"
-#include "Poco/DynamicStruct.h"
-#include <algorithm>
-#include <cctype>
-
-
-namespace Poco {
-
-
-DynamicAny::DynamicAny():
-	_pHolder(new DynamicAnyHolderImpl<int>(0))
-{
-}
-
-
-DynamicAny::DynamicAny(const char* pVal): 
-	_pHolder(new DynamicAnyHolderImpl<std::string>(pVal))
-{
-}
-
-
-DynamicAny::DynamicAny(const DynamicAny& other):
-	_pHolder(0)
-{
-	if (other._pHolder)
-		_pHolder = other._pHolder->clone();
-}
-
-
-DynamicAny::~DynamicAny()
-{
-	delete _pHolder;
-}
-
-
-DynamicAny& DynamicAny::operator = (const DynamicAny& other)
-{
-	DynamicAny tmp(other);
-	swap(tmp);
-	return *this;
-}
-
-
-const DynamicAny DynamicAny::operator + (const DynamicAny& other) const
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return add<Poco::Int64>(other);
-		else
-			return add<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return add<double>(other);
-	else if (isString())
-		return add<std::string>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-DynamicAny& DynamicAny::operator += (const DynamicAny& other)
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return *this = add<Poco::Int64>(other);
-		else
-			return *this = add<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return *this = add<double>(other);
-	else if (isString())
-		return *this = add<std::string>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-const DynamicAny DynamicAny::operator - (const DynamicAny& other) const
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return subtract<Poco::Int64>(other);
-		else
-			return subtract<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return subtract<double>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-DynamicAny& DynamicAny::operator -= (const DynamicAny& other)
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return *this = subtract<Poco::Int64>(other);
-		else
-			return *this = subtract<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return *this = subtract<double>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-const DynamicAny DynamicAny::operator * (const DynamicAny& other) const
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return multiply<Poco::Int64>(other);
-		else
-			return multiply<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return multiply<double>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-DynamicAny& DynamicAny::operator *= (const DynamicAny& other)
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return *this = multiply<Poco::Int64>(other);
-		else
-			return *this = multiply<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return *this = multiply<double>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-const DynamicAny DynamicAny::operator / (const DynamicAny& other) const
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return divide<Poco::Int64>(other);
-		else
-			return divide<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return divide<double>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-DynamicAny& DynamicAny::operator /= (const DynamicAny& other)
-{
-	if (isInteger())
-	{
-		if(isSigned())
-			return *this = divide<Poco::Int64>(other);
-		else
-			return *this = divide<Poco::UInt64>(other);
-	}
-	else if (isNumeric())
-		return *this = divide<double>(other);
-	else
-		throw InvalidArgumentException("Invalid operation for this data type.");
-}
-
-
-DynamicAny& DynamicAny::operator ++ ()
-{
-	if (!isInteger())
-		throw InvalidArgumentException("Invalid operation for this data type.");
-
-	return *this = *this + 1;
-}
-
-DynamicAny DynamicAny::operator ++ (int)
-{
-	if (!isInteger())
-		throw InvalidArgumentException("Invalid operation for this data type.");
-
-	DynamicAny tmp(*this);
-	*this += 1;
-	return tmp;
-}
-
-DynamicAny& DynamicAny::operator -- ()
-{
-	if (!isInteger())
-		throw InvalidArgumentException("Invalid operation for this data type.");
-
-	return *this = *this - 1;
-}
-
-DynamicAny DynamicAny::operator -- (int)
-{
-	if (!isInteger())
-		throw InvalidArgumentException("Invalid operation for this data type.");
-
-	DynamicAny tmp(*this);
-	*this -= 1;
-	return tmp;
-}
-
-
-DynamicAny& DynamicAny::operator [] (const std::string& name)
-{
-	DynamicAnyHolderImpl<DynamicStruct>* pHolder = dynamic_cast<DynamicAnyHolderImpl<DynamicStruct> *>(_pHolder);
-	if (pHolder)
-		return pHolder->operator[](name);
-	else
-		throw BadCastException();
-}
-
-
-const DynamicAny& DynamicAny::operator [] (const std::string& name) const
-{
-	const DynamicAnyHolderImpl<DynamicStruct>* pHolder = dynamic_cast<const DynamicAnyHolderImpl<DynamicStruct>* >(_pHolder);
-	if (pHolder)
-		return pHolder->operator[](name);
-	else
-		throw BadCastException();
-}
-
-
-DynamicAny DynamicAny::parse(const std::string& val)
-{
-	std::string::size_type t = 0;
-	return parse(val, t);
-}
-
-
-DynamicAny DynamicAny::parse(const std::string& val, std::string::size_type& pos)
-{
-	// { -> an Object==DynamicStruct
-	// [ -> an array
-	// '/" -> a string (strip '/")
-	// other: also treat as string
-	skipWhiteSpace(val, pos);
-	if (pos < val.size())
-	{
-		switch (val[pos])
-		{
-		case '{':
-			return parseObject(val, pos);
-		case '[':
-			return parseArray(val, pos);
-		default:
-			return parseString(val, pos);
-		}
-	}
-	std::string empty;
-	return empty;
-}
-
-
-DynamicAny DynamicAny::parseObject(const std::string& val, std::string::size_type& pos)
-{
-	poco_assert_dbg (val[pos] == '{');
-	++pos;
-	skipWhiteSpace(val, pos);
-	DynamicStruct aStruct;
-	while (val[pos] != '}' && pos < val.size())
-	{
-		std::string key = parseString(val, pos);
-		skipWhiteSpace(val, pos);
-		if (val[pos] != ':')
-			throw DataFormatException("Incorrect object, must contain: key : value pairs"); 
-		++pos; // skip past :
-		DynamicAny value = parse(val, pos);
-		aStruct.insert(key, value);
-		skipWhiteSpace(val, pos);
-		if (val[pos] == ',')
-		{
-			++pos;
-			skipWhiteSpace(val, pos);
-		}
-	}
-	if (val[pos] != '}')
-		throw DataFormatException("Unterminated object"); 
-	++pos;
-	return aStruct;
-}
-
-
-DynamicAny DynamicAny::parseArray(const std::string& val, std::string::size_type& pos)
-{
-	poco_assert_dbg (val[pos] == '[');
-	++pos;
-	skipWhiteSpace(val, pos);
-	std::vector<DynamicAny> result;
-	while (val[pos] != ']' && pos < val.size())
-	{
-		result.push_back(parse(val, pos));
-		skipWhiteSpace(val, pos);
-		if (val[pos] == ',')
-		{
-			++pos;
-			skipWhiteSpace(val, pos);
-		}
-	}
-	if (val[pos] != ']')
-		throw DataFormatException("Unterminated array"); 
-	++pos;
-	return result;
-}
-
-
-std::string DynamicAny::parseString(const std::string& val, std::string::size_type& pos)
-{
-	static const std::string STR_STOP("'\"");
-	static const std::string OTHER_STOP(" ,]}"); // we stop at space, ',', ']' or '}'
-
-	bool inString = false;
-	//skip optional ' "
-	if (val[pos] == '\'' || val[pos] == '"')
-	{
-		inString = true;
-		++pos;
-	}
-	
-	std::string::size_type stop = std::string::npos;
-	if (inString)
-	{
-		stop = val.find_first_of(STR_STOP, pos);
-		if (stop == std::string::npos)
-			throw DataFormatException("Unterminated string");
-	}
-	else
-	{
-		// we stop at space, ',', ']' or '}' or end of string
-		stop = val.find_first_of(OTHER_STOP, pos);
-		if (stop == std::string::npos)
-			stop = val.size();
-
-		std::string::size_type safeCheck = val.find_first_of(STR_STOP, pos);
-		if (safeCheck != std::string::npos && safeCheck < stop)
-			throw DataFormatException("Misplaced string termination char found");
-
-	}
-
-	// stop now points to the last char to be not included
-	std::string result = val.substr(pos, stop - pos);
-	++stop; // point past '/"
-	pos = stop;
-	return result;
-}
-
-
-void DynamicAny::skipWhiteSpace(const std::string& val, std::string::size_type& pos)
-{
-	while (std::isspace(val[pos]))
-		++pos;
-}
-
-
-std::string DynamicAny::toString(const DynamicAny& any)
-{
-	std::string res;
-	appendJSONString(res, any);
-	return res;
-}
-
-
-} // namespace Poco::Poco
+//
+// DynamicAny.cpp
+//
+// $Id: //poco/svn/Foundation/src/DynamicAny.cpp#3 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  DynamicAny
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/DynamicAny.h"
+#include "Poco/DynamicStruct.h"
+#include <algorithm>
+#include <cctype>
+
+
+namespace Poco {
+
+
+DynamicAny::DynamicAny():
+	_pHolder(new DynamicAnyHolderImpl<int>(0))
+{
+}
+
+
+DynamicAny::DynamicAny(const char* pVal): 
+	_pHolder(new DynamicAnyHolderImpl<std::string>(pVal))
+{
+}
+
+
+DynamicAny::DynamicAny(const DynamicAny& other):
+	_pHolder(0)
+{
+	if (other._pHolder)
+		_pHolder = other._pHolder->clone();
+}
+
+
+DynamicAny::~DynamicAny()
+{
+	delete _pHolder;
+}
+
+
+DynamicAny& DynamicAny::operator = (const DynamicAny& other)
+{
+	DynamicAny tmp(other);
+	swap(tmp);
+	return *this;
+}
+
+
+const DynamicAny DynamicAny::operator + (const DynamicAny& other) const
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return add<Poco::Int64>(other);
+		else
+			return add<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return add<double>(other);
+	else if (isString())
+		return add<std::string>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+DynamicAny& DynamicAny::operator += (const DynamicAny& other)
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return *this = add<Poco::Int64>(other);
+		else
+			return *this = add<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return *this = add<double>(other);
+	else if (isString())
+		return *this = add<std::string>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+const DynamicAny DynamicAny::operator - (const DynamicAny& other) const
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return subtract<Poco::Int64>(other);
+		else
+			return subtract<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return subtract<double>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+DynamicAny& DynamicAny::operator -= (const DynamicAny& other)
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return *this = subtract<Poco::Int64>(other);
+		else
+			return *this = subtract<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return *this = subtract<double>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+const DynamicAny DynamicAny::operator * (const DynamicAny& other) const
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return multiply<Poco::Int64>(other);
+		else
+			return multiply<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return multiply<double>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+DynamicAny& DynamicAny::operator *= (const DynamicAny& other)
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return *this = multiply<Poco::Int64>(other);
+		else
+			return *this = multiply<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return *this = multiply<double>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+const DynamicAny DynamicAny::operator / (const DynamicAny& other) const
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return divide<Poco::Int64>(other);
+		else
+			return divide<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return divide<double>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+DynamicAny& DynamicAny::operator /= (const DynamicAny& other)
+{
+	if (isInteger())
+	{
+		if(isSigned())
+			return *this = divide<Poco::Int64>(other);
+		else
+			return *this = divide<Poco::UInt64>(other);
+	}
+	else if (isNumeric())
+		return *this = divide<double>(other);
+	else
+		throw InvalidArgumentException("Invalid operation for this data type.");
+}
+
+
+DynamicAny& DynamicAny::operator ++ ()
+{
+	if (!isInteger())
+		throw InvalidArgumentException("Invalid operation for this data type.");
+
+	return *this = *this + 1;
+}
+
+DynamicAny DynamicAny::operator ++ (int)
+{
+	if (!isInteger())
+		throw InvalidArgumentException("Invalid operation for this data type.");
+
+	DynamicAny tmp(*this);
+	*this += 1;
+	return tmp;
+}
+
+DynamicAny& DynamicAny::operator -- ()
+{
+	if (!isInteger())
+		throw InvalidArgumentException("Invalid operation for this data type.");
+
+	return *this = *this - 1;
+}
+
+DynamicAny DynamicAny::operator -- (int)
+{
+	if (!isInteger())
+		throw InvalidArgumentException("Invalid operation for this data type.");
+
+	DynamicAny tmp(*this);
+	*this -= 1;
+	return tmp;
+}
+
+
+DynamicAny& DynamicAny::operator [] (const std::string& name)
+{
+	DynamicAnyHolderImpl<DynamicStruct>* pHolder = dynamic_cast<DynamicAnyHolderImpl<DynamicStruct> *>(_pHolder);
+	if (pHolder)
+		return pHolder->operator[](name);
+	else
+		throw BadCastException();
+}
+
+
+const DynamicAny& DynamicAny::operator [] (const std::string& name) const
+{
+	const DynamicAnyHolderImpl<DynamicStruct>* pHolder = dynamic_cast<const DynamicAnyHolderImpl<DynamicStruct>* >(_pHolder);
+	if (pHolder)
+		return pHolder->operator[](name);
+	else
+		throw BadCastException();
+}
+
+
+DynamicAny DynamicAny::parse(const std::string& val)
+{
+	std::string::size_type t = 0;
+	return parse(val, t);
+}
+
+
+DynamicAny DynamicAny::parse(const std::string& val, std::string::size_type& pos)
+{
+	// { -> an Object==DynamicStruct
+	// [ -> an array
+	// '/" -> a string (strip '/")
+	// other: also treat as string
+	skipWhiteSpace(val, pos);
+	if (pos < val.size())
+	{
+		switch (val[pos])
+		{
+		case '{':
+			return parseObject(val, pos);
+		case '[':
+			return parseArray(val, pos);
+		default:
+			return parseString(val, pos);
+		}
+	}
+	std::string empty;
+	return empty;
+}
+
+
+DynamicAny DynamicAny::parseObject(const std::string& val, std::string::size_type& pos)
+{
+	poco_assert_dbg (val[pos] == '{');
+	++pos;
+	skipWhiteSpace(val, pos);
+	DynamicStruct aStruct;
+	while (val[pos] != '}' && pos < val.size())
+	{
+		std::string key = parseString(val, pos);
+		skipWhiteSpace(val, pos);
+		if (val[pos] != ':')
+			throw DataFormatException("Incorrect object, must contain: key : value pairs"); 
+		++pos; // skip past :
+		DynamicAny value = parse(val, pos);
+		aStruct.insert(key, value);
+		skipWhiteSpace(val, pos);
+		if (val[pos] == ',')
+		{
+			++pos;
+			skipWhiteSpace(val, pos);
+		}
+	}
+	if (val[pos] != '}')
+		throw DataFormatException("Unterminated object"); 
+	++pos;
+	return aStruct;
+}
+
+
+DynamicAny DynamicAny::parseArray(const std::string& val, std::string::size_type& pos)
+{
+	poco_assert_dbg (val[pos] == '[');
+	++pos;
+	skipWhiteSpace(val, pos);
+	std::vector<DynamicAny> result;
+	while (val[pos] != ']' && pos < val.size())
+	{
+		result.push_back(parse(val, pos));
+		skipWhiteSpace(val, pos);
+		if (val[pos] == ',')
+		{
+			++pos;
+			skipWhiteSpace(val, pos);
+		}
+	}
+	if (val[pos] != ']')
+		throw DataFormatException("Unterminated array"); 
+	++pos;
+	return result;
+}
+
+
+std::string DynamicAny::parseString(const std::string& val, std::string::size_type& pos)
+{
+	static const std::string STR_STOP("'\"");
+	static const std::string OTHER_STOP(" ,]}"); // we stop at space, ',', ']' or '}'
+
+	bool inString = false;
+	//skip optional ' "
+	if (val[pos] == '\'' || val[pos] == '"')
+	{
+		inString = true;
+		++pos;
+	}
+	
+	std::string::size_type stop = std::string::npos;
+	if (inString)
+	{
+		stop = val.find_first_of(STR_STOP, pos);
+		if (stop == std::string::npos)
+			throw DataFormatException("Unterminated string");
+	}
+	else
+	{
+		// we stop at space, ',', ']' or '}' or end of string
+		stop = val.find_first_of(OTHER_STOP, pos);
+		if (stop == std::string::npos)
+			stop = val.size();
+
+		std::string::size_type safeCheck = val.find_first_of(STR_STOP, pos);
+		if (safeCheck != std::string::npos && safeCheck < stop)
+			throw DataFormatException("Misplaced string termination char found");
+
+	}
+
+	// stop now points to the last char to be not included
+	std::string result = val.substr(pos, stop - pos);
+	++stop; // point past '/"
+	pos = stop;
+	return result;
+}
+
+
+void DynamicAny::skipWhiteSpace(const std::string& val, std::string::size_type& pos)
+{
+	while (std::isspace(val[pos]))
+		++pos;
+}
+
+
+std::string DynamicAny::toString(const DynamicAny& any)
+{
+	std::string res;
+	appendJSONString(res, any);
+	return res;
+}
+
+
+} // namespace Poco::Poco
diff --git a/Foundation/src/DynamicAnyHolder.cpp b/Foundation/src/DynamicAnyHolder.cpp
index 3274296c8..c63c6f927 100644
--- a/Foundation/src/DynamicAnyHolder.cpp
+++ b/Foundation/src/DynamicAnyHolder.cpp
@@ -1,69 +1,69 @@
-//
-// DynamicAnyHolder.cpp
-//
-// $Id: //poco/svn/Foundation/src/DynamicAnyHolder.cpp#3 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  DynamicAnyHolder
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/DynamicAnyHolder.h"
-#include "Poco/DynamicAny.h"
-
-
-namespace Poco {
-
-
-DynamicAnyHolder::DynamicAnyHolder()
-{
-}
-
-
-DynamicAnyHolder::~DynamicAnyHolder()
-{
-}
-
-
-void appendJSONString(std::string& val, const DynamicAny& any)
-{
-	bool isJsonString = (any.type() == typeid(std::string) || any.type() == typeid(char) || any.type() == typeid(Poco::DateTime) || any.type() == typeid(Poco::LocalDateTime));
-	if (isJsonString)
-	{
-		val.append(1, '\'');
-	}
-	val.append(any.convert<std::string>());
-	if (isJsonString)
-	{
-		val.append(1, '\'');
-	}
-}
-
-
-} // namespace Poco
+//
+// DynamicAnyHolder.cpp
+//
+// $Id: //poco/svn/Foundation/src/DynamicAnyHolder.cpp#3 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  DynamicAnyHolder
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/DynamicAnyHolder.h"
+#include "Poco/DynamicAny.h"
+
+
+namespace Poco {
+
+
+DynamicAnyHolder::DynamicAnyHolder()
+{
+}
+
+
+DynamicAnyHolder::~DynamicAnyHolder()
+{
+}
+
+
+void appendJSONString(std::string& val, const DynamicAny& any)
+{
+	bool isJsonString = (any.type() == typeid(std::string) || any.type() == typeid(char) || any.type() == typeid(Poco::DateTime) || any.type() == typeid(Poco::LocalDateTime));
+	if (isJsonString)
+	{
+		val.append(1, '\'');
+	}
+	val.append(any.convert<std::string>());
+	if (isJsonString)
+	{
+		val.append(1, '\'');
+	}
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/DynamicStruct.cpp b/Foundation/src/DynamicStruct.cpp
index ee6abb90a..6fa982896 100644
--- a/Foundation/src/DynamicStruct.cpp
+++ b/Foundation/src/DynamicStruct.cpp
@@ -1,81 +1,81 @@
-//
-// DynamicStruct.cpp
-//
-// $Id: //poco/Main/Foundation/src/DynamicStruct.cpp#4 $
-//
-// Library: Foundation
-// Package: Core
-// Module:  DynamicStruct
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/DynamicStruct.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-
-
-DynamicStruct::DynamicStruct():
-	_data()
-{
-}
-
-
-DynamicStruct::DynamicStruct(const Data& d):
-	_data(d)
-{
-}
-
-
-DynamicStruct::~DynamicStruct()
-{
-}
-
-
-const DynamicAny& DynamicStruct::operator[](const std::string& name) const
-{
-	ConstIterator it = find(name);
-	if (it == end())
-		throw NotFoundException(name);
-	return it->second;
-}
-
-
-std::set<std::string> DynamicStruct::members() const
-{
-	std::set<std::string> keys;
-	ConstIterator it = begin();
-	ConstIterator itEnd = end();
-	for (; it != itEnd; ++it)
-		keys.insert(it->first);
-	return keys;
-}
-
-
-} // namespace Poco::Poco
+//
+// DynamicStruct.cpp
+//
+// $Id: //poco/Main/Foundation/src/DynamicStruct.cpp#4 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  DynamicStruct
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/DynamicStruct.h"
+#include "Poco/Exception.h"
+
+
+namespace Poco {
+
+
+DynamicStruct::DynamicStruct():
+	_data()
+{
+}
+
+
+DynamicStruct::DynamicStruct(const Data& d):
+	_data(d)
+{
+}
+
+
+DynamicStruct::~DynamicStruct()
+{
+}
+
+
+const DynamicAny& DynamicStruct::operator[](const std::string& name) const
+{
+	ConstIterator it = find(name);
+	if (it == end())
+		throw NotFoundException(name);
+	return it->second;
+}
+
+
+std::set<std::string> DynamicStruct::members() const
+{
+	std::set<std::string> keys;
+	ConstIterator it = begin();
+	ConstIterator itEnd = end();
+	for (; it != itEnd; ++it)
+		keys.insert(it->first);
+	return keys;
+}
+
+
+} // namespace Poco::Poco
diff --git a/Foundation/src/FileStream.cpp b/Foundation/src/FileStream.cpp
index e45742f2c..03446ee96 100644
--- a/Foundation/src/FileStream.cpp
+++ b/Foundation/src/FileStream.cpp
@@ -1,140 +1,140 @@
-//
-// FileStream.cpp
-//
-// $Id: //poco/svn/Foundation/src/FileStream.cpp#2 $
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/FileStream.h"
-#include "Poco/Exception.h"
-#if defined(POCO_OS_FAMILY_WINDOWS)
-#include "FileStream_WIN32.cpp"
-#else
-#include "FileStream_POSIX.cpp"
-#endif
-
-
-namespace Poco {
-
-
-FileIOS::FileIOS(std::ios::openmode defaultMode):
-	_defaultMode(defaultMode)
-{
-	poco_ios_init(&_buf);
-}
-
-
-FileIOS::~FileIOS()
-{
-}
-
-
-void FileIOS::open(const std::string& path, std::ios::openmode mode)
-{
-	clear();
-	_buf.open(path, mode | _defaultMode);
-}
-
-
-void FileIOS::close()
-{
-	_buf.close();
-}
-
-
-FileStreamBuf* FileIOS::rdbuf()
-{
-	return &_buf;
-}
-
-
-FileInputStream::FileInputStream():
-	FileIOS(std::ios::in),
-	std::istream(&_buf)
-{
-}
-
-
-FileInputStream::FileInputStream(const std::string& path, std::ios::openmode mode):
-	FileIOS(std::ios::in),
-	std::istream(&_buf)
-{
-	open(path, mode);
-}
-
-
-FileInputStream::~FileInputStream()
-{
-}
-
-
-FileOutputStream::FileOutputStream():
-	FileIOS(std::ios::out),
-	std::ostream(&_buf)
-{
-}
-
-
-FileOutputStream::FileOutputStream(const std::string& path, std::ios::openmode mode):
-	FileIOS(std::ios::out),
-	std::ostream(&_buf)
-{
-	open(path, mode);
-}
-
-
-FileOutputStream::~FileOutputStream()
-{
-}
-
-
-FileStream::FileStream():
-	FileIOS(std::ios::in | std::ios::out),
-	std::iostream(&_buf)
-{
-}
-
-
-FileStream::FileStream(const std::string& path, std::ios::openmode mode):
-	FileIOS(std::ios::in | std::ios::out),
-	std::iostream(&_buf)
-{
-	open(path, mode);
-}
-
-
-FileStream::~FileStream()
-{
-}
-
-
-} // namespace Poco
+//
+// FileStream.cpp
+//
+// $Id: //poco/svn/Foundation/src/FileStream.cpp#2 $
+//
+// Library: Foundation
+// Package: Streams
+// Module:  FileStream
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/FileStream.h"
+#include "Poco/Exception.h"
+#if defined(POCO_OS_FAMILY_WINDOWS)
+#include "FileStream_WIN32.cpp"
+#else
+#include "FileStream_POSIX.cpp"
+#endif
+
+
+namespace Poco {
+
+
+FileIOS::FileIOS(std::ios::openmode defaultMode):
+	_defaultMode(defaultMode)
+{
+	poco_ios_init(&_buf);
+}
+
+
+FileIOS::~FileIOS()
+{
+}
+
+
+void FileIOS::open(const std::string& path, std::ios::openmode mode)
+{
+	clear();
+	_buf.open(path, mode | _defaultMode);
+}
+
+
+void FileIOS::close()
+{
+	_buf.close();
+}
+
+
+FileStreamBuf* FileIOS::rdbuf()
+{
+	return &_buf;
+}
+
+
+FileInputStream::FileInputStream():
+	FileIOS(std::ios::in),
+	std::istream(&_buf)
+{
+}
+
+
+FileInputStream::FileInputStream(const std::string& path, std::ios::openmode mode):
+	FileIOS(std::ios::in),
+	std::istream(&_buf)
+{
+	open(path, mode);
+}
+
+
+FileInputStream::~FileInputStream()
+{
+}
+
+
+FileOutputStream::FileOutputStream():
+	FileIOS(std::ios::out),
+	std::ostream(&_buf)
+{
+}
+
+
+FileOutputStream::FileOutputStream(const std::string& path, std::ios::openmode mode):
+	FileIOS(std::ios::out),
+	std::ostream(&_buf)
+{
+	open(path, mode);
+}
+
+
+FileOutputStream::~FileOutputStream()
+{
+}
+
+
+FileStream::FileStream():
+	FileIOS(std::ios::in | std::ios::out),
+	std::iostream(&_buf)
+{
+}
+
+
+FileStream::FileStream(const std::string& path, std::ios::openmode mode):
+	FileIOS(std::ios::in | std::ios::out),
+	std::iostream(&_buf)
+{
+	open(path, mode);
+}
+
+
+FileStream::~FileStream()
+{
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/FileStream_POSIX.cpp b/Foundation/src/FileStream_POSIX.cpp
index c78050427..4c388de70 100644
--- a/Foundation/src/FileStream_POSIX.cpp
+++ b/Foundation/src/FileStream_POSIX.cpp
@@ -1,183 +1,183 @@
-//
-// FileStream_POSIX.cpp
-//
-// $Id: //poco/svn/Foundation/src/FileStream_POSIX.cpp#2 $
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/FileStream.h"
-#include "Poco/File.h"
-#include "Poco/Exception.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-
-namespace Poco {
-
-
-FileStreamBuf::FileStreamBuf():
-	BufferedBidirectionalStreamBuf(BUFFER_SIZE, std::ios::in | std::ios::out),
-	_fd(-1),
-	_pos(0)
-{
-}
-
-
-FileStreamBuf::~FileStreamBuf()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-	}
-}
-
-
-void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
-{
-	poco_assert (_fd == -1);
-
-	_path = path;
-	setMode(mode);
-
-	int flags(0);
-	if (mode & std::ios::trunc)
-		flags |= O_TRUNC;
-	if (mode & std::ios::app)
-		flags |= O_APPEND;
-	if (mode & std::ios::out)
-		flags |= O_CREAT;
-	if ((mode & std::ios::in) && (mode & std::ios::out))
-		flags |= O_RDWR;
-	else if (mode & std::ios::in)
-		flags |= O_RDONLY;
-	else
-		flags |= O_WRONLY;
-			
-	_fd = ::open(path.c_str(), flags, S_IRUSR | S_IWUSR | S_IRGRP);
-	if (_fd == -1)
-		File::handleLastError(_path);
-		
-	if ((mode & std::ios::app) || (mode & std::ios::ate))
-		seekoff(0, std::ios::end, mode);
-}
-
-
-int FileStreamBuf::readFromDevice(char* buffer, std::streamsize length)
-{
-	if (_fd == -1) return -1;
-	
-	if (getMode() & std::ios::out)
-		sync();
-	
-	int n = read(_fd, buffer, length);
-	if (n == -1)
-		File::handleLastError(_path);
-	_pos += n;
-	return n;
-}
-
-
-int FileStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
-{
-	if (_fd == -1) return -1;
-
-	int n = write(_fd, buffer, length);
-	if (n == -1)
-		File::handleLastError(_path);
-	_pos += n;
-	return n;
-}
-
-
-void FileStreamBuf::close()
-{
-	if (_fd != -1)
-	{
-		sync();
-		::close(_fd);
-		_fd = -1;
-	}
-}
-
-
-std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode)
-{
-	if (_fd == -1 || !(getMode() & mode)) 
-		return -1;
-
-	if (getMode() & std::ios::out)
-		sync();
-
-	std::streamoff adj;
-	if (mode & std::ios::in)
-		adj = static_cast<std::streamoff>(egptr() - gptr());
-	else
-		adj = 0;
-
-	resetBuffers();
-
-	int whence = SEEK_SET;
-	if (dir == std::ios::cur)
-	{
-		whence = SEEK_CUR;
-		off -= adj;
-	}
-	else if (dir == std::ios::end)
-	{
-		whence = SEEK_END;
-	}
-	_pos = lseek(_fd, off, whence);
-	return _pos;
-}
-
-
-std::streampos FileStreamBuf::seekpos(std::streampos pos, std::ios::openmode mode)
-{
-	if (_fd == -1 || !(getMode() & mode)) 
-		return -1;
-
-	if (getMode() & std::ios::out)
-		sync();
-
-	resetBuffers();
-
-	_pos = lseek(_fd, pos, SEEK_SET);
-	return _pos;
-}
-
-
-} // namespace Poco
+//
+// FileStream_POSIX.cpp
+//
+// $Id: //poco/svn/Foundation/src/FileStream_POSIX.cpp#2 $
+//
+// Library: Foundation
+// Package: Streams
+// Module:  FileStream
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/FileStream.h"
+#include "Poco/File.h"
+#include "Poco/Exception.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+namespace Poco {
+
+
+FileStreamBuf::FileStreamBuf():
+	BufferedBidirectionalStreamBuf(BUFFER_SIZE, std::ios::in | std::ios::out),
+	_fd(-1),
+	_pos(0)
+{
+}
+
+
+FileStreamBuf::~FileStreamBuf()
+{
+	try
+	{
+		close();
+	}
+	catch (...)
+	{
+	}
+}
+
+
+void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
+{
+	poco_assert (_fd == -1);
+
+	_path = path;
+	setMode(mode);
+
+	int flags(0);
+	if (mode & std::ios::trunc)
+		flags |= O_TRUNC;
+	if (mode & std::ios::app)
+		flags |= O_APPEND;
+	if (mode & std::ios::out)
+		flags |= O_CREAT;
+	if ((mode & std::ios::in) && (mode & std::ios::out))
+		flags |= O_RDWR;
+	else if (mode & std::ios::in)
+		flags |= O_RDONLY;
+	else
+		flags |= O_WRONLY;
+			
+	_fd = ::open(path.c_str(), flags, S_IRUSR | S_IWUSR | S_IRGRP);
+	if (_fd == -1)
+		File::handleLastError(_path);
+		
+	if ((mode & std::ios::app) || (mode & std::ios::ate))
+		seekoff(0, std::ios::end, mode);
+}
+
+
+int FileStreamBuf::readFromDevice(char* buffer, std::streamsize length)
+{
+	if (_fd == -1) return -1;
+	
+	if (getMode() & std::ios::out)
+		sync();
+	
+	int n = read(_fd, buffer, length);
+	if (n == -1)
+		File::handleLastError(_path);
+	_pos += n;
+	return n;
+}
+
+
+int FileStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
+{
+	if (_fd == -1) return -1;
+
+	int n = write(_fd, buffer, length);
+	if (n == -1)
+		File::handleLastError(_path);
+	_pos += n;
+	return n;
+}
+
+
+void FileStreamBuf::close()
+{
+	if (_fd != -1)
+	{
+		sync();
+		::close(_fd);
+		_fd = -1;
+	}
+}
+
+
+std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode)
+{
+	if (_fd == -1 || !(getMode() & mode)) 
+		return -1;
+
+	if (getMode() & std::ios::out)
+		sync();
+
+	std::streamoff adj;
+	if (mode & std::ios::in)
+		adj = static_cast<std::streamoff>(egptr() - gptr());
+	else
+		adj = 0;
+
+	resetBuffers();
+
+	int whence = SEEK_SET;
+	if (dir == std::ios::cur)
+	{
+		whence = SEEK_CUR;
+		off -= adj;
+	}
+	else if (dir == std::ios::end)
+	{
+		whence = SEEK_END;
+	}
+	_pos = lseek(_fd, off, whence);
+	return _pos;
+}
+
+
+std::streampos FileStreamBuf::seekpos(std::streampos pos, std::ios::openmode mode)
+{
+	if (_fd == -1 || !(getMode() & mode)) 
+		return -1;
+
+	if (getMode() & std::ios::out)
+		sync();
+
+	resetBuffers();
+
+	_pos = lseek(_fd, pos, SEEK_SET);
+	return _pos;
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/FileStream_WIN32.cpp b/Foundation/src/FileStream_WIN32.cpp
index 5ce244162..c8ea1c3a4 100644
--- a/Foundation/src/FileStream_WIN32.cpp
+++ b/Foundation/src/FileStream_WIN32.cpp
@@ -1,223 +1,223 @@
-//
-// FileStream.cpp
-//
-// $Id: //poco/svn/Foundation/src/FileStream_WIN32.cpp#2 $
-//
-// Library: Foundation
-// Package: Streams
-// Module:  FileStream
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/FileStream.h"
-#include "Poco/File.h"
-#include "Poco/Exception.h"
-#if defined (POCO_WIN32_UTF8)
-#include "Poco/UnicodeConverter.h"
-#endif
-
-
-namespace Poco {
-
-
-FileStreamBuf::FileStreamBuf():
-	BufferedBidirectionalStreamBuf(BUFFER_SIZE, 0),
-	_handle(INVALID_HANDLE_VALUE),
-	_pos(0)
-{
-}
-
-
-FileStreamBuf::~FileStreamBuf()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-	}
-}
-
-
-void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
-{
-	poco_assert (_handle == INVALID_HANDLE_VALUE);
-
-	_path = path;
-	setMode(mode);
-
-	DWORD access = 0;
-	if (mode & std::ios::in)
-		access |= GENERIC_READ;
-	if (mode & std::ios::out)
-		access |= GENERIC_WRITE;
-
-	DWORD shareMode = FILE_SHARE_READ;
-	DWORD creationDisp = OPEN_EXISTING;
-	if (mode & std::ios::trunc)
-		creationDisp = CREATE_ALWAYS;
-	else if (mode & std::ios::out)
-		creationDisp = OPEN_ALWAYS;
-
-	DWORD flags = FILE_ATTRIBUTE_NORMAL;
-	
-#if defined (POCO_WIN32_UTF8)
-	std::wstring utf16Path;
-	UnicodeConverter::toUTF16(path, utf16Path);
-	_handle = CreateFileW(utf16Path.c_str(), access, shareMode, NULL, creationDisp, flags, NULL);
-#else
-	_handle = CreateFileA(path.c_str(), access, shareMode, NULL, creationDisp, flags, NULL);
-#endif
-
-	if (_handle == INVALID_HANDLE_VALUE)
-		File::handleLastError(_path);
-		
-	if ((mode & std::ios::ate) || (mode & std::ios::app))
-		seekoff(0, std::ios::end, mode);
-}
-
-
-int FileStreamBuf::readFromDevice(char* buffer, std::streamsize length)
-{
-	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & std::ios::in))
-		return -1;
-
-	if (getMode() & std::ios::out)
-		sync();
-	
-	DWORD bytesRead(0);
-	BOOL rc = ReadFile(_handle, buffer, static_cast<DWORD>(length), &bytesRead, NULL);
-	if (rc == 0)
-		File::handleLastError(_path);
-
-	_pos += bytesRead;
-
-	return static_cast<int>(bytesRead);
-}
-
-
-int FileStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
-{
-	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & std::ios::out))
-		return -1;
-
-	if (getMode() & std::ios::app)
-	{
-		LARGE_INTEGER li;
-		li.QuadPart = 0;
-		li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, FILE_END);
-		if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
-			File::handleLastError(_path);
-		_pos = li.QuadPart;
-	}
-
-	DWORD bytesWritten(0);
-	BOOL rc = WriteFile(_handle, buffer, static_cast<DWORD>(length), &bytesWritten, NULL);
-	if (rc == 0)
-		File::handleLastError(_path);
-		
-	_pos += bytesWritten;
-
-	return static_cast<int>(bytesWritten);
-}
-
-
-void FileStreamBuf::close()
-{
-	if (_handle != INVALID_HANDLE_VALUE)
-	{
-		if (getMode() & std::ios::out)
-			sync();
-			
-		CloseHandle(_handle);
-		_handle = INVALID_HANDLE_VALUE;
-	}
-}
-
-
-std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode)
-{
-	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & mode))
-		return -1;
-	
-	if (getMode() & std::ios::out)
-		sync();
-
-	std::streamoff adj;
-	if (mode & std::ios::in)
-		adj = static_cast<std::streamoff>(egptr() - gptr());
-	else
-		adj = 0;
-
-	resetBuffers();
-
-	DWORD offset = FILE_BEGIN;
-	if (dir == std::ios::cur)
-	{
-		offset = FILE_CURRENT;
-		off -= adj;
-	}
-	else if (dir == std::ios::end)
-	{
-		offset = FILE_END;
-	}
-	
-	LARGE_INTEGER li;
-	li.QuadPart = off;
-	li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, offset);
-
-	if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
-		File::handleLastError(_path);
-	_pos = li.QuadPart;
-	return std::streampos(static_cast<std::streamoff>(_pos));
-}
-
-
-std::streampos FileStreamBuf::seekpos(std::streampos pos, std::ios::openmode mode)
-{
-	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & mode))
-		return -1;
-
-	if (getMode() & std::ios::out)
-		sync();
-
-	resetBuffers();
-
-	LARGE_INTEGER li;
-	li.QuadPart = pos;
-	li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, FILE_BEGIN);
-
-	if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
-		File::handleLastError(_path);
-	_pos = li.QuadPart;
-	return std::streampos(static_cast<std::streamoff>(_pos));
-}
-
-
-} // namespace Poco
+//
+// FileStream.cpp
+//
+// $Id: //poco/svn/Foundation/src/FileStream_WIN32.cpp#2 $
+//
+// Library: Foundation
+// Package: Streams
+// Module:  FileStream
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/FileStream.h"
+#include "Poco/File.h"
+#include "Poco/Exception.h"
+#if defined (POCO_WIN32_UTF8)
+#include "Poco/UnicodeConverter.h"
+#endif
+
+
+namespace Poco {
+
+
+FileStreamBuf::FileStreamBuf():
+	BufferedBidirectionalStreamBuf(BUFFER_SIZE, 0),
+	_handle(INVALID_HANDLE_VALUE),
+	_pos(0)
+{
+}
+
+
+FileStreamBuf::~FileStreamBuf()
+{
+	try
+	{
+		close();
+	}
+	catch (...)
+	{
+	}
+}
+
+
+void FileStreamBuf::open(const std::string& path, std::ios::openmode mode)
+{
+	poco_assert (_handle == INVALID_HANDLE_VALUE);
+
+	_path = path;
+	setMode(mode);
+
+	DWORD access = 0;
+	if (mode & std::ios::in)
+		access |= GENERIC_READ;
+	if (mode & std::ios::out)
+		access |= GENERIC_WRITE;
+
+	DWORD shareMode = FILE_SHARE_READ;
+	DWORD creationDisp = OPEN_EXISTING;
+	if (mode & std::ios::trunc)
+		creationDisp = CREATE_ALWAYS;
+	else if (mode & std::ios::out)
+		creationDisp = OPEN_ALWAYS;
+
+	DWORD flags = FILE_ATTRIBUTE_NORMAL;
+	
+#if defined (POCO_WIN32_UTF8)
+	std::wstring utf16Path;
+	UnicodeConverter::toUTF16(path, utf16Path);
+	_handle = CreateFileW(utf16Path.c_str(), access, shareMode, NULL, creationDisp, flags, NULL);
+#else
+	_handle = CreateFileA(path.c_str(), access, shareMode, NULL, creationDisp, flags, NULL);
+#endif
+
+	if (_handle == INVALID_HANDLE_VALUE)
+		File::handleLastError(_path);
+		
+	if ((mode & std::ios::ate) || (mode & std::ios::app))
+		seekoff(0, std::ios::end, mode);
+}
+
+
+int FileStreamBuf::readFromDevice(char* buffer, std::streamsize length)
+{
+	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & std::ios::in))
+		return -1;
+
+	if (getMode() & std::ios::out)
+		sync();
+	
+	DWORD bytesRead(0);
+	BOOL rc = ReadFile(_handle, buffer, static_cast<DWORD>(length), &bytesRead, NULL);
+	if (rc == 0)
+		File::handleLastError(_path);
+
+	_pos += bytesRead;
+
+	return static_cast<int>(bytesRead);
+}
+
+
+int FileStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
+{
+	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & std::ios::out))
+		return -1;
+
+	if (getMode() & std::ios::app)
+	{
+		LARGE_INTEGER li;
+		li.QuadPart = 0;
+		li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, FILE_END);
+		if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
+			File::handleLastError(_path);
+		_pos = li.QuadPart;
+	}
+
+	DWORD bytesWritten(0);
+	BOOL rc = WriteFile(_handle, buffer, static_cast<DWORD>(length), &bytesWritten, NULL);
+	if (rc == 0)
+		File::handleLastError(_path);
+		
+	_pos += bytesWritten;
+
+	return static_cast<int>(bytesWritten);
+}
+
+
+void FileStreamBuf::close()
+{
+	if (_handle != INVALID_HANDLE_VALUE)
+	{
+		if (getMode() & std::ios::out)
+			sync();
+			
+		CloseHandle(_handle);
+		_handle = INVALID_HANDLE_VALUE;
+	}
+}
+
+
+std::streampos FileStreamBuf::seekoff(std::streamoff off, std::ios::seekdir dir, std::ios::openmode mode)
+{
+	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & mode))
+		return -1;
+	
+	if (getMode() & std::ios::out)
+		sync();
+
+	std::streamoff adj;
+	if (mode & std::ios::in)
+		adj = static_cast<std::streamoff>(egptr() - gptr());
+	else
+		adj = 0;
+
+	resetBuffers();
+
+	DWORD offset = FILE_BEGIN;
+	if (dir == std::ios::cur)
+	{
+		offset = FILE_CURRENT;
+		off -= adj;
+	}
+	else if (dir == std::ios::end)
+	{
+		offset = FILE_END;
+	}
+	
+	LARGE_INTEGER li;
+	li.QuadPart = off;
+	li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, offset);
+
+	if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
+		File::handleLastError(_path);
+	_pos = li.QuadPart;
+	return std::streampos(static_cast<std::streamoff>(_pos));
+}
+
+
+std::streampos FileStreamBuf::seekpos(std::streampos pos, std::ios::openmode mode)
+{
+	if (INVALID_HANDLE_VALUE == _handle || !(getMode() & mode))
+		return -1;
+
+	if (getMode() & std::ios::out)
+		sync();
+
+	resetBuffers();
+
+	LARGE_INTEGER li;
+	li.QuadPart = pos;
+	li.LowPart  = SetFilePointer(_handle, li.LowPart, &li.HighPart, FILE_BEGIN);
+
+	if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
+		File::handleLastError(_path);
+	_pos = li.QuadPart;
+	return std::streampos(static_cast<std::streamoff>(_pos));
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/Hash.cpp b/Foundation/src/Hash.cpp
index 4036aa9b7..f0b30ac2e 100644
--- a/Foundation/src/Hash.cpp
+++ b/Foundation/src/Hash.cpp
@@ -1,56 +1,56 @@
-//
-// Hash.cpp
-//
-// $Id: //poco/svn/Foundation/src/Hash.cpp#2 $
-//
-// Library: Foundation
-// Package: Hashing
-// Module:  Hash
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Hash.h"
-
-
-namespace Poco {
-
-
-std::size_t hash(const std::string& str)
-{
-	std::size_t h = 0;
-	std::string::const_iterator it  = str.begin();
-	std::string::const_iterator end = str.end();
-	while (it != end)
-	{
-		h = h * 0xf4243 ^ *it++;
-	}
-	return h;
-}
-
-
-} // namespace Poco
+//
+// Hash.cpp
+//
+// $Id: //poco/svn/Foundation/src/Hash.cpp#2 $
+//
+// Library: Foundation
+// Package: Hashing
+// Module:  Hash
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Hash.h"
+
+
+namespace Poco {
+
+
+std::size_t hash(const std::string& str)
+{
+	std::size_t h = 0;
+	std::string::const_iterator it  = str.begin();
+	std::string::const_iterator end = str.end();
+	while (it != end)
+	{
+		h = h * 0xf4243 ^ *it++;
+	}
+	return h;
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/SharedMemory.cpp b/Foundation/src/SharedMemory.cpp
index 6458a05e0..03ce55f77 100644
--- a/Foundation/src/SharedMemory.cpp
+++ b/Foundation/src/SharedMemory.cpp
@@ -1,118 +1,118 @@
-//
-// SharedMemory.cpp
-//
-// $Id: //poco/svn/Foundation/src/SharedMemory.cpp#3 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemory
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#if POCO_OS == POCO_OS_SOLARIS
-#undef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 500
-#endif
-
-
-#include "Poco/SharedMemory.h"
-#include "Poco/Exception.h"
-#if defined(POCO_NO_SHAREDMEMORY)
-#include "SharedMemory_DUMMY.cpp"
-#elif defined(POCO_OS_FAMILY_WINDOWS)
-#include "SharedMemory_WIN32.cpp"
-#elif defined(POCO_OS_FAMILY_UNIX)
-#include "SharedMemory_POSIX.cpp"
-#else
-#include "SharedMemory_DUMMY.cpp"
-#endif
-
-
-namespace Poco {
-
-
-SharedMemory::SharedMemory():
-	_pImpl(0)
-{
-}
-
-
-SharedMemory::SharedMemory(const std::string& name, std::size_t size, AccessMode mode, const void* addrHint, bool server):
-	_pImpl(new SharedMemoryImpl(name, size, mode, addrHint, server))
-{
-}
-
-
-SharedMemory::SharedMemory(const Poco::File& file, AccessMode mode, const void* addrHint):
-	_pImpl(new SharedMemoryImpl(file, mode, addrHint))
-{
-}
-
-
-SharedMemory::SharedMemory(const SharedMemory& other):
-	_pImpl(other._pImpl)
-{
-	if (_pImpl)
-		_pImpl->duplicate();
-}
-
-
-SharedMemory::~SharedMemory()
-{
-	if (_pImpl)
-		_pImpl->release();
-}
-
-
-SharedMemory& SharedMemory::operator = (const SharedMemory& other)
-{
-	SharedMemory tmp(other);
-	swap(tmp);
-	return *this;
-}
-
-
-char* SharedMemory::begin() const
-{
-	if (_pImpl)
-		return _pImpl->begin();
-	else
-		return 0;
-}
-
-
-char* SharedMemory::end() const
-{
-	if (_pImpl)
-		return _pImpl->end();
-	else
-		return 0;
-}
-
-
-} // namespace Poco
+//
+// SharedMemory.cpp
+//
+// $Id: //poco/svn/Foundation/src/SharedMemory.cpp#3 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemory
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#if POCO_OS == POCO_OS_SOLARIS
+#undef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
+#endif
+
+
+#include "Poco/SharedMemory.h"
+#include "Poco/Exception.h"
+#if defined(POCO_NO_SHAREDMEMORY)
+#include "SharedMemory_DUMMY.cpp"
+#elif defined(POCO_OS_FAMILY_WINDOWS)
+#include "SharedMemory_WIN32.cpp"
+#elif defined(POCO_OS_FAMILY_UNIX)
+#include "SharedMemory_POSIX.cpp"
+#else
+#include "SharedMemory_DUMMY.cpp"
+#endif
+
+
+namespace Poco {
+
+
+SharedMemory::SharedMemory():
+	_pImpl(0)
+{
+}
+
+
+SharedMemory::SharedMemory(const std::string& name, std::size_t size, AccessMode mode, const void* addrHint, bool server):
+	_pImpl(new SharedMemoryImpl(name, size, mode, addrHint, server))
+{
+}
+
+
+SharedMemory::SharedMemory(const Poco::File& file, AccessMode mode, const void* addrHint):
+	_pImpl(new SharedMemoryImpl(file, mode, addrHint))
+{
+}
+
+
+SharedMemory::SharedMemory(const SharedMemory& other):
+	_pImpl(other._pImpl)
+{
+	if (_pImpl)
+		_pImpl->duplicate();
+}
+
+
+SharedMemory::~SharedMemory()
+{
+	if (_pImpl)
+		_pImpl->release();
+}
+
+
+SharedMemory& SharedMemory::operator = (const SharedMemory& other)
+{
+	SharedMemory tmp(other);
+	swap(tmp);
+	return *this;
+}
+
+
+char* SharedMemory::begin() const
+{
+	if (_pImpl)
+		return _pImpl->begin();
+	else
+		return 0;
+}
+
+
+char* SharedMemory::end() const
+{
+	if (_pImpl)
+		return _pImpl->end();
+	else
+		return 0;
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/SharedMemory_DUMMY.cpp b/Foundation/src/SharedMemory_DUMMY.cpp
index 075637c6b..b210150c3 100644
--- a/Foundation/src/SharedMemory_DUMMY.cpp
+++ b/Foundation/src/SharedMemory_DUMMY.cpp
@@ -1,58 +1,58 @@
-//
-// SharedMemoryImpl.cpp
-//
-// $Id: //poco/svn/Foundation/src/SharedMemory_DUMMY.cpp#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/SharedMemory_DUMMY.h"
-
-
-namespace Poco {
-
-
-SharedMemoryImpl::SharedMemoryImpl(const std::string&, std::size_t, SharedMemory::AccessMode, const void*, bool)
-{
-}
-
-
-SharedMemoryImpl::SharedMemoryImpl(const Poco::File&, SharedMemory::AccessMode, const void*)
-{
-}
-
-
-SharedMemoryImpl::~SharedMemoryImpl()
-{
-}
-
-
-} // namespace Poco
+//
+// SharedMemoryImpl.cpp
+//
+// $Id: //poco/svn/Foundation/src/SharedMemory_DUMMY.cpp#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemoryImpl
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/SharedMemory_DUMMY.h"
+
+
+namespace Poco {
+
+
+SharedMemoryImpl::SharedMemoryImpl(const std::string&, std::size_t, SharedMemory::AccessMode, const void*, bool)
+{
+}
+
+
+SharedMemoryImpl::SharedMemoryImpl(const Poco::File&, SharedMemory::AccessMode, const void*)
+{
+}
+
+
+SharedMemoryImpl::~SharedMemoryImpl()
+{
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/SharedMemory_POSIX.cpp b/Foundation/src/SharedMemory_POSIX.cpp
index c4931c50d..3edb1d69e 100644
--- a/Foundation/src/SharedMemory_POSIX.cpp
+++ b/Foundation/src/SharedMemory_POSIX.cpp
@@ -1,156 +1,156 @@
-//
-// SharedMemoryImpl.cpp
-//
-// $Id: //poco/svn/Foundation/src/SharedMemory_POSIX.cpp#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/SharedMemory_POSIX.h"
-#include "Poco/Exception.h"
-#include "Poco/File.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-
-namespace Poco {
-
-
-SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void* addrHint, bool server):
-	_size(size),
-	_fd(-1),
-	_address(0),
-	_access(mode),
-	_name("/"),
-	_fileMapped(false),
-	_server(server)
-{
-#if POCO_OS == POCO_OS_HPUX
-	_name.append("tmp/");
-#endif
-
-	_name.append(name);
-
-	int flags = O_CREAT;
-	if (_access == SharedMemory::AM_WRITE)
-		flags |= O_RDWR;
-	else
-		flags |= O_RDONLY;
-
-	// open the shared memory segment
-	_fd = ::shm_open(_name.c_str(), flags, S_IRUSR | S_IWUSR);
-	if (_fd == -1)
-		throw SystemException("Cannot create shared memory object", _name);
-
-	// now set the correct size for the segment
-	if (-1 == ::ftruncate(_fd, size))
-	{
-		::close(_fd);
-		_fd = -1;
-		::shm_unlink(_name.c_str());
-		throw SystemException("Cannot resize shared memory object", _name);
-	}
-	map(addrHint);
-}
-
-
-SharedMemoryImpl::SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void* addrHint):
-	_size(0),
-	_fd(-1),
-	_address(0),
-	_access(mode),
-	_name(file.path()),
-	_fileMapped(true),
-	_server(false)
-{
-	if (!file.exists() || !file.isFile())
-		throw FileNotFoundException(file.path());
-
-	_size = file.getSize();
-	int flag = O_RDONLY;
-	if (mode == SharedMemory::AM_WRITE)
-		flag = O_RDWR;
-	_fd = ::open(_name.c_str(), flag);
-	if (-1 == _fd)
-		throw OpenFileException("Cannot open memory mapped file", _name);
-
-	map(addrHint);
-}
-
-
-SharedMemoryImpl::~SharedMemoryImpl()
-{
-	unmap();
-	close();
-}
-
-
-void SharedMemoryImpl::map(const void* addrHint)
-{
-	int access = PROT_READ;
-	if (_access == SharedMemory::AM_WRITE)
-		access |= PROT_WRITE;
-
-	void* addr = ::mmap(const_cast<void*>(addrHint), _size, access, MAP_SHARED, _fd, 0);
-	if (addr == MAP_FAILED)
-		throw SystemException("Cannot map file into shared memory", _name);
-
-	_address = static_cast<char*>(addr);
-}
-
-
-void SharedMemoryImpl::unmap()
-{
-	if (_address)
-	{
-		::munmap(_address, _size);
-	}
-}
-
-
-void SharedMemoryImpl::close()
-{
-	if (_fd != -1)
-	{
-		::close(_fd);
-		_fd = -1;
-	}
-	if (!_fileMapped && _server)
-	{
-		::shm_unlink(_name.c_str());
-	}
-}
-
-
-} // namespace Poco
+//
+// SharedMemoryImpl.cpp
+//
+// $Id: //poco/svn/Foundation/src/SharedMemory_POSIX.cpp#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemoryImpl
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/SharedMemory_POSIX.h"
+#include "Poco/Exception.h"
+#include "Poco/File.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+namespace Poco {
+
+
+SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void* addrHint, bool server):
+	_size(size),
+	_fd(-1),
+	_address(0),
+	_access(mode),
+	_name("/"),
+	_fileMapped(false),
+	_server(server)
+{
+#if POCO_OS == POCO_OS_HPUX
+	_name.append("tmp/");
+#endif
+
+	_name.append(name);
+
+	int flags = O_CREAT;
+	if (_access == SharedMemory::AM_WRITE)
+		flags |= O_RDWR;
+	else
+		flags |= O_RDONLY;
+
+	// open the shared memory segment
+	_fd = ::shm_open(_name.c_str(), flags, S_IRUSR | S_IWUSR);
+	if (_fd == -1)
+		throw SystemException("Cannot create shared memory object", _name);
+
+	// now set the correct size for the segment
+	if (-1 == ::ftruncate(_fd, size))
+	{
+		::close(_fd);
+		_fd = -1;
+		::shm_unlink(_name.c_str());
+		throw SystemException("Cannot resize shared memory object", _name);
+	}
+	map(addrHint);
+}
+
+
+SharedMemoryImpl::SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void* addrHint):
+	_size(0),
+	_fd(-1),
+	_address(0),
+	_access(mode),
+	_name(file.path()),
+	_fileMapped(true),
+	_server(false)
+{
+	if (!file.exists() || !file.isFile())
+		throw FileNotFoundException(file.path());
+
+	_size = file.getSize();
+	int flag = O_RDONLY;
+	if (mode == SharedMemory::AM_WRITE)
+		flag = O_RDWR;
+	_fd = ::open(_name.c_str(), flag);
+	if (-1 == _fd)
+		throw OpenFileException("Cannot open memory mapped file", _name);
+
+	map(addrHint);
+}
+
+
+SharedMemoryImpl::~SharedMemoryImpl()
+{
+	unmap();
+	close();
+}
+
+
+void SharedMemoryImpl::map(const void* addrHint)
+{
+	int access = PROT_READ;
+	if (_access == SharedMemory::AM_WRITE)
+		access |= PROT_WRITE;
+
+	void* addr = ::mmap(const_cast<void*>(addrHint), _size, access, MAP_SHARED, _fd, 0);
+	if (addr == MAP_FAILED)
+		throw SystemException("Cannot map file into shared memory", _name);
+
+	_address = static_cast<char*>(addr);
+}
+
+
+void SharedMemoryImpl::unmap()
+{
+	if (_address)
+	{
+		::munmap(_address, _size);
+	}
+}
+
+
+void SharedMemoryImpl::close()
+{
+	if (_fd != -1)
+	{
+		::close(_fd);
+		_fd = -1;
+	}
+	if (!_fileMapped && _server)
+	{
+		::shm_unlink(_name.c_str());
+	}
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/SharedMemory_WIN32.cpp b/Foundation/src/SharedMemory_WIN32.cpp
index 8bd6629ff..a949cd385 100644
--- a/Foundation/src/SharedMemory_WIN32.cpp
+++ b/Foundation/src/SharedMemory_WIN32.cpp
@@ -1,166 +1,166 @@
-//
-// SharedMemoryImpl.cpp
-//
-// $Id: //poco/svn/Foundation/src/SharedMemory_WIN32.cpp#2 $
-//
-// Library: Foundation
-// Package: Processes
-// Module:  SharedMemoryImpl
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/SharedMemory_WIN32.h"
-#include "Poco/Exception.h"
-#include "Poco/File.h"
-#if defined (POCO_WIN32_UTF8)
-#include "Poco/UnicodeConverter.h"
-#endif
-#include "Poco/UnWindows.h"
-
-
-namespace Poco {
-
-
-SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void*, bool):
-	_name(name),
-	_memHandle(INVALID_HANDLE_VALUE),
-	_fileHandle(INVALID_HANDLE_VALUE),
-	_size(static_cast<DWORD>(size)),
-	_mode(PAGE_READONLY),
-	_address(0)
-{
-	if (mode == SharedMemory::AM_WRITE)
-		_mode = PAGE_READWRITE;
-
-#if defined (POCO_WIN32_UTF8)
-	std::wstring utf16name;
-	UnicodeConverter::toUTF16(_name, utf16name);
-	_memHandle = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, _mode, 0, _size, utf16name.c_str());
-#else
-	_memHandle = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, _mode, 0, _size, _name.c_str());
-#endif
-
-	if (!_memHandle)
-		throw SystemException("Cannot create shared memory object", _name);
-
-	map();
-}
-
-
-SharedMemoryImpl::SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void*):
-	_name(file.path()),
-	_memHandle(INVALID_HANDLE_VALUE),
-	_fileHandle(INVALID_HANDLE_VALUE),
-	_size(0),
-	_mode(PAGE_READONLY),
-	_address(0)
-{
-	if (!file.exists() || !file.isFile())
-		throw FileNotFoundException(_name);
-
-	_size = static_cast<DWORD>(file.getSize());
-
-	DWORD shareMode = FILE_SHARE_READ;
-	DWORD fileMode  = GENERIC_READ;
-
-	if (mode == SharedMemory::AM_WRITE)
-	{
-		_mode = PAGE_READWRITE;
-		fileMode |= GENERIC_WRITE;
-	}
-
-#if defined (POCO_WIN32_UTF8)
-	std::wstring utf16name;
-	UnicodeConverter::toUTF16(_name, utf16name);
-	_fileHandle = CreateFileW(utf16name.c_str(), fileMode, shareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#else
-	_fileHandle = CreateFileA(_name.c_str(), fileMode, shareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-#endif
-
-	if (_fileHandle == INVALID_HANDLE_VALUE)
-		throw OpenFileException("Cannot open memory mapped file", _name);
-
-	_memHandle = CreateFileMapping(_fileHandle, NULL, _mode, 0, 0, NULL);
-	if (!_memHandle)
-	{
-		CloseHandle(_fileHandle);
-		_fileHandle = INVALID_HANDLE_VALUE;
-		throw SystemException("Cannot map file into shared memory", _name);
-	}
-	map();
-}
-
-
-SharedMemoryImpl::~SharedMemoryImpl()
-{
-	unmap();
-	close();
-}
-
-
-void SharedMemoryImpl::map()
-{
-	DWORD access = FILE_MAP_READ;
-	if (_mode == PAGE_READWRITE)
-		access = FILE_MAP_WRITE;
-	LPVOID addr = MapViewOfFile(_memHandle, access, 0, 0, _size);
-	if (!addr)
-		throw SystemException("Cannot map shared memory object", _name);
-
-	_address = static_cast<char*>(addr);
-}
-
-
-void SharedMemoryImpl::unmap()
-{
-	if (_address)
-	{
-		UnmapViewOfFile(_address);
-		_address = 0;
-		return;
-	}
-}
-
-
-void SharedMemoryImpl::close()
-{
-	if (_memHandle != INVALID_HANDLE_VALUE)
-	{
-		CloseHandle(_memHandle);
-		_memHandle = INVALID_HANDLE_VALUE;
-	}
-
-	if (_fileHandle != INVALID_HANDLE_VALUE)
-	{
-		CloseHandle(_fileHandle);
-		_fileHandle = INVALID_HANDLE_VALUE;
-	}
-}
-
-
-} // namespace Poco
+//
+// SharedMemoryImpl.cpp
+//
+// $Id: //poco/svn/Foundation/src/SharedMemory_WIN32.cpp#2 $
+//
+// Library: Foundation
+// Package: Processes
+// Module:  SharedMemoryImpl
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/SharedMemory_WIN32.h"
+#include "Poco/Exception.h"
+#include "Poco/File.h"
+#if defined (POCO_WIN32_UTF8)
+#include "Poco/UnicodeConverter.h"
+#endif
+#include "Poco/UnWindows.h"
+
+
+namespace Poco {
+
+
+SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, SharedMemory::AccessMode mode, const void*, bool):
+	_name(name),
+	_memHandle(INVALID_HANDLE_VALUE),
+	_fileHandle(INVALID_HANDLE_VALUE),
+	_size(static_cast<DWORD>(size)),
+	_mode(PAGE_READONLY),
+	_address(0)
+{
+	if (mode == SharedMemory::AM_WRITE)
+		_mode = PAGE_READWRITE;
+
+#if defined (POCO_WIN32_UTF8)
+	std::wstring utf16name;
+	UnicodeConverter::toUTF16(_name, utf16name);
+	_memHandle = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, _mode, 0, _size, utf16name.c_str());
+#else
+	_memHandle = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, _mode, 0, _size, _name.c_str());
+#endif
+
+	if (!_memHandle)
+		throw SystemException("Cannot create shared memory object", _name);
+
+	map();
+}
+
+
+SharedMemoryImpl::SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessMode mode, const void*):
+	_name(file.path()),
+	_memHandle(INVALID_HANDLE_VALUE),
+	_fileHandle(INVALID_HANDLE_VALUE),
+	_size(0),
+	_mode(PAGE_READONLY),
+	_address(0)
+{
+	if (!file.exists() || !file.isFile())
+		throw FileNotFoundException(_name);
+
+	_size = static_cast<DWORD>(file.getSize());
+
+	DWORD shareMode = FILE_SHARE_READ;
+	DWORD fileMode  = GENERIC_READ;
+
+	if (mode == SharedMemory::AM_WRITE)
+	{
+		_mode = PAGE_READWRITE;
+		fileMode |= GENERIC_WRITE;
+	}
+
+#if defined (POCO_WIN32_UTF8)
+	std::wstring utf16name;
+	UnicodeConverter::toUTF16(_name, utf16name);
+	_fileHandle = CreateFileW(utf16name.c_str(), fileMode, shareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#else
+	_fileHandle = CreateFileA(_name.c_str(), fileMode, shareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
+
+	if (_fileHandle == INVALID_HANDLE_VALUE)
+		throw OpenFileException("Cannot open memory mapped file", _name);
+
+	_memHandle = CreateFileMapping(_fileHandle, NULL, _mode, 0, 0, NULL);
+	if (!_memHandle)
+	{
+		CloseHandle(_fileHandle);
+		_fileHandle = INVALID_HANDLE_VALUE;
+		throw SystemException("Cannot map file into shared memory", _name);
+	}
+	map();
+}
+
+
+SharedMemoryImpl::~SharedMemoryImpl()
+{
+	unmap();
+	close();
+}
+
+
+void SharedMemoryImpl::map()
+{
+	DWORD access = FILE_MAP_READ;
+	if (_mode == PAGE_READWRITE)
+		access = FILE_MAP_WRITE;
+	LPVOID addr = MapViewOfFile(_memHandle, access, 0, 0, _size);
+	if (!addr)
+		throw SystemException("Cannot map shared memory object", _name);
+
+	_address = static_cast<char*>(addr);
+}
+
+
+void SharedMemoryImpl::unmap()
+{
+	if (_address)
+	{
+		UnmapViewOfFile(_address);
+		_address = 0;
+		return;
+	}
+}
+
+
+void SharedMemoryImpl::close()
+{
+	if (_memHandle != INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(_memHandle);
+		_memHandle = INVALID_HANDLE_VALUE;
+	}
+
+	if (_fileHandle != INVALID_HANDLE_VALUE)
+	{
+		CloseHandle(_fileHandle);
+		_fileHandle = INVALID_HANDLE_VALUE;
+	}
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/UTF8String.cpp b/Foundation/src/UTF8String.cpp
index d55c1c856..0afe84c7a 100644
--- a/Foundation/src/UTF8String.cpp
+++ b/Foundation/src/UTF8String.cpp
@@ -1,203 +1,203 @@
-//
-// UTF8String.cpp
-//
-// $Id: //poco/svn/Foundation/src/UTF8String.cpp#2 $
-//
-// Library: Foundation
-// Package: Text
-// Module:  UTF8String
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/UTF8String.h"
-#include "Poco/Unicode.h"
-#include "Poco/TextIterator.h"
-#include "Poco/TextConverter.h"
-#include "Poco/UTF8Encoding.h"
-#include <algorithm>
-
-
-namespace Poco {
-
-
-int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, std::string::const_iterator it2, std::string::const_iterator end2)
-{
-	static UTF8Encoding utf8;
-	
-	std::string::size_type sz = str.size();
-	if (pos > sz) pos = sz;
-	if (pos + n > sz) n = sz - pos;
-	TextIterator uit1(str.begin() + pos, str.begin() + pos + n, utf8); 
-	TextIterator uend1(str.begin() + pos + n);
-	TextIterator uit2(it2, end2, utf8);
-	TextIterator uend2(end2);
-	while (uit1 != uend1 && uit2 != uend2)
-	{
-        int c1 = Unicode::toLower(*uit1);
-        int c2 = Unicode::toLower(*uit2);
-        if (c1 < c2)
-            return -1;
-        else if (c1 > c2)
-            return 1;
-        ++uit1; ++uit2;
-	}
-    
-    if (uit1 == uend1)
-		return uit2 == uend2 ? 0 : -1;
-    else
-        return 1;
-}
-
-
-int UTF8::icompare(const std::string& str1, const std::string& str2)
-{
-	return icompare(str1, 0, str1.size(), str2.begin(), str2.end());
-}
-
-
-int UTF8::icompare(const std::string& str1, std::string::size_type n1, const std::string& str2, std::string::size_type n2)
-{
-	if (n2 > str2.size()) n2 = str2.size();
-	return icompare(str1, 0, n1, str2.begin(), str2.begin() + n2);
-}
-
-
-int UTF8::icompare(const std::string& str1, std::string::size_type n, const std::string& str2)
-{
-	if (n > str2.size()) n = str2.size();
-	return icompare(str1, 0, n, str2.begin(), str2.begin() + n);
-}
-
-
-int UTF8::icompare(const std::string& str1, std::string::size_type pos, std::string::size_type n, const std::string& str2)
-{
-	return icompare(str1, pos, n, str2.begin(), str2.end());
-}
-
-
-int UTF8::icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n1, const std::string& str2, std::string::size_type pos2, std::string::size_type n2)
-{
-	std::string::size_type sz2 = str2.size();
-	if (pos2 > sz2) pos2 = sz2;
-	if (pos2 + n2 > sz2) n2 = sz2 - pos2;
-	return icompare(str1, pos1, n1, str2.begin() + pos2, str2.begin() + pos2 + n2);
-}
-
-
-int UTF8::icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n, const std::string& str2, std::string::size_type pos2)
-{
-	std::string::size_type sz2 = str2.size();
-	if (pos2 > sz2) pos2 = sz2;
-	if (pos2 + n > sz2) n = sz2 - pos2;
-	return icompare(str1, pos1, n, str2.begin() + pos2, str2.begin() + pos2 + n);
-}
-
-
-int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr)
-{
-	static UTF8Encoding utf8;
-
-	poco_check_ptr (ptr);
-	std::string::size_type sz = str.size();
-	if (pos > sz) pos = sz;
-	if (pos + n > sz) n = sz - pos;
-	TextIterator uit(str.begin() + pos, str.begin() + pos + n, utf8); 
-	TextIterator uend(str.begin() + pos + n);
-	while (uit != uend && *ptr)
-	{
-        int c1 = Unicode::toLower(*uit);
-        int c2 = Unicode::toLower(*ptr);
-        if (c1 < c2)
-            return -1;
-        else if (c1 > c2)
-            return 1;
-        ++uit; ++ptr;
-	}
-    
-    if (uit == uend)
-		return *ptr == 0 ? 0 : -1;
-    else
-        return 1;
-}
-
-
-int UTF8::icompare(const std::string& str, std::string::size_type pos, const std::string::value_type* ptr)
-{
-	return icompare(str, pos, str.size() - pos, ptr);
-}
-
-
-int UTF8::icompare(const std::string& str, const std::string::value_type* ptr)
-{
-	return icompare(str, 0, str.size(), ptr);
-}
-
-
-std::string UTF8::toUpper(const std::string& str)
-{
-	static UTF8Encoding utf8;
-	std::string result;
-	TextConverter converter(utf8, utf8);
-	converter.convert(str, result, Unicode::toUpper);
-	return result;
-}
-
-
-std::string& UTF8::toUpperInPlace(std::string& str)
-{
-	static UTF8Encoding utf8;
-	std::string result;
-	TextConverter converter(utf8, utf8);
-	converter.convert(str, result, Unicode::toUpper);
-	std::swap(str, result);
-	return str;
-}
-
-
-std::string UTF8::toLower(const std::string& str)
-{
-	static UTF8Encoding utf8;
-	std::string result;
-	TextConverter converter(utf8, utf8);
-	converter.convert(str, result, Unicode::toLower);
-	return result;
-}
-
-
-std::string& UTF8::toLowerInPlace(std::string& str)
-{
-	static UTF8Encoding utf8;
-	std::string result;
-	TextConverter converter(utf8, utf8);
-	converter.convert(str, result, Unicode::toLower);
-	std::swap(str, result);
-	return str;
-}
-
-
-} // namespace Poco
+//
+// UTF8String.cpp
+//
+// $Id: //poco/svn/Foundation/src/UTF8String.cpp#2 $
+//
+// Library: Foundation
+// Package: Text
+// Module:  UTF8String
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/UTF8String.h"
+#include "Poco/Unicode.h"
+#include "Poco/TextIterator.h"
+#include "Poco/TextConverter.h"
+#include "Poco/UTF8Encoding.h"
+#include <algorithm>
+
+
+namespace Poco {
+
+
+int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, std::string::const_iterator it2, std::string::const_iterator end2)
+{
+	static UTF8Encoding utf8;
+	
+	std::string::size_type sz = str.size();
+	if (pos > sz) pos = sz;
+	if (pos + n > sz) n = sz - pos;
+	TextIterator uit1(str.begin() + pos, str.begin() + pos + n, utf8); 
+	TextIterator uend1(str.begin() + pos + n);
+	TextIterator uit2(it2, end2, utf8);
+	TextIterator uend2(end2);
+	while (uit1 != uend1 && uit2 != uend2)
+	{
+        int c1 = Unicode::toLower(*uit1);
+        int c2 = Unicode::toLower(*uit2);
+        if (c1 < c2)
+            return -1;
+        else if (c1 > c2)
+            return 1;
+        ++uit1; ++uit2;
+	}
+    
+    if (uit1 == uend1)
+		return uit2 == uend2 ? 0 : -1;
+    else
+        return 1;
+}
+
+
+int UTF8::icompare(const std::string& str1, const std::string& str2)
+{
+	return icompare(str1, 0, str1.size(), str2.begin(), str2.end());
+}
+
+
+int UTF8::icompare(const std::string& str1, std::string::size_type n1, const std::string& str2, std::string::size_type n2)
+{
+	if (n2 > str2.size()) n2 = str2.size();
+	return icompare(str1, 0, n1, str2.begin(), str2.begin() + n2);
+}
+
+
+int UTF8::icompare(const std::string& str1, std::string::size_type n, const std::string& str2)
+{
+	if (n > str2.size()) n = str2.size();
+	return icompare(str1, 0, n, str2.begin(), str2.begin() + n);
+}
+
+
+int UTF8::icompare(const std::string& str1, std::string::size_type pos, std::string::size_type n, const std::string& str2)
+{
+	return icompare(str1, pos, n, str2.begin(), str2.end());
+}
+
+
+int UTF8::icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n1, const std::string& str2, std::string::size_type pos2, std::string::size_type n2)
+{
+	std::string::size_type sz2 = str2.size();
+	if (pos2 > sz2) pos2 = sz2;
+	if (pos2 + n2 > sz2) n2 = sz2 - pos2;
+	return icompare(str1, pos1, n1, str2.begin() + pos2, str2.begin() + pos2 + n2);
+}
+
+
+int UTF8::icompare(const std::string& str1, std::string::size_type pos1, std::string::size_type n, const std::string& str2, std::string::size_type pos2)
+{
+	std::string::size_type sz2 = str2.size();
+	if (pos2 > sz2) pos2 = sz2;
+	if (pos2 + n > sz2) n = sz2 - pos2;
+	return icompare(str1, pos1, n, str2.begin() + pos2, str2.begin() + pos2 + n);
+}
+
+
+int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr)
+{
+	static UTF8Encoding utf8;
+
+	poco_check_ptr (ptr);
+	std::string::size_type sz = str.size();
+	if (pos > sz) pos = sz;
+	if (pos + n > sz) n = sz - pos;
+	TextIterator uit(str.begin() + pos, str.begin() + pos + n, utf8); 
+	TextIterator uend(str.begin() + pos + n);
+	while (uit != uend && *ptr)
+	{
+        int c1 = Unicode::toLower(*uit);
+        int c2 = Unicode::toLower(*ptr);
+        if (c1 < c2)
+            return -1;
+        else if (c1 > c2)
+            return 1;
+        ++uit; ++ptr;
+	}
+    
+    if (uit == uend)
+		return *ptr == 0 ? 0 : -1;
+    else
+        return 1;
+}
+
+
+int UTF8::icompare(const std::string& str, std::string::size_type pos, const std::string::value_type* ptr)
+{
+	return icompare(str, pos, str.size() - pos, ptr);
+}
+
+
+int UTF8::icompare(const std::string& str, const std::string::value_type* ptr)
+{
+	return icompare(str, 0, str.size(), ptr);
+}
+
+
+std::string UTF8::toUpper(const std::string& str)
+{
+	static UTF8Encoding utf8;
+	std::string result;
+	TextConverter converter(utf8, utf8);
+	converter.convert(str, result, Unicode::toUpper);
+	return result;
+}
+
+
+std::string& UTF8::toUpperInPlace(std::string& str)
+{
+	static UTF8Encoding utf8;
+	std::string result;
+	TextConverter converter(utf8, utf8);
+	converter.convert(str, result, Unicode::toUpper);
+	std::swap(str, result);
+	return str;
+}
+
+
+std::string UTF8::toLower(const std::string& str)
+{
+	static UTF8Encoding utf8;
+	std::string result;
+	TextConverter converter(utf8, utf8);
+	converter.convert(str, result, Unicode::toLower);
+	return result;
+}
+
+
+std::string& UTF8::toLowerInPlace(std::string& str)
+{
+	static UTF8Encoding utf8;
+	std::string result;
+	TextConverter converter(utf8, utf8);
+	converter.convert(str, result, Unicode::toLower);
+	std::swap(str, result);
+	return str;
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/Unicode.cpp b/Foundation/src/Unicode.cpp
index 7e2ce940a..86413a4e4 100644
--- a/Foundation/src/Unicode.cpp
+++ b/Foundation/src/Unicode.cpp
@@ -1,94 +1,94 @@
-//
-// Unicode.cpp
-//
-// $Id: //poco/svn/Foundation/src/Unicode.cpp#2 $
-//
-// Library: Foundation
-// Package: Text
-// Module:  Unicode
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Unicode.h"
-
-
-extern "C"
-{
-#include "pcre_internal.h"
-}
-
-
-namespace Poco {
-
-
-void Unicode::properties(int ch, CharacterProperties& props)
-{
-	int type;
-	int script;
-	int category = _pcre_ucp_findprop(static_cast<unsigned>(ch), &type, &script);
-	props.category = static_cast<CharacterCategory>(category);
-	props.type     = static_cast<CharacterType>(type);
-	props.script   = static_cast<Script>(script);
-}
-
-	
-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)
-{
-	if (isUpper(ch))
-		return static_cast<int>(_pcre_ucp_othercase(static_cast<unsigned>(ch)));
-	else
-		return ch;
-}
-
-
-int Unicode::toUpper(int ch)
-{
-	if (isLower(ch))
-		return static_cast<int>(_pcre_ucp_othercase(static_cast<unsigned>(ch)));
-	else
-		return ch;
-}
-
-
-} // namespace Poco
+//
+// Unicode.cpp
+//
+// $Id: //poco/svn/Foundation/src/Unicode.cpp#2 $
+//
+// Library: Foundation
+// Package: Text
+// Module:  Unicode
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Unicode.h"
+
+
+extern "C"
+{
+#include "pcre_internal.h"
+}
+
+
+namespace Poco {
+
+
+void Unicode::properties(int ch, CharacterProperties& props)
+{
+	int type;
+	int script;
+	int category = _pcre_ucp_findprop(static_cast<unsigned>(ch), &type, &script);
+	props.category = static_cast<CharacterCategory>(category);
+	props.type     = static_cast<CharacterType>(type);
+	props.script   = static_cast<Script>(script);
+}
+
+	
+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)
+{
+	if (isUpper(ch))
+		return static_cast<int>(_pcre_ucp_othercase(static_cast<unsigned>(ch)));
+	else
+		return ch;
+}
+
+
+int Unicode::toUpper(int ch)
+{
+	if (isLower(ch))
+		return static_cast<int>(_pcre_ucp_othercase(static_cast<unsigned>(ch)));
+	else
+		return ch;
+}
+
+
+} // namespace Poco
diff --git a/Foundation/src/WindowsConsoleChannel.cpp b/Foundation/src/WindowsConsoleChannel.cpp
index bf2c3c649..cb5ede69e 100644
--- a/Foundation/src/WindowsConsoleChannel.cpp
+++ b/Foundation/src/WindowsConsoleChannel.cpp
@@ -1,88 +1,88 @@
-//
-// WindowsConsoleChannel.cpp
-//
-// $Id: //poco/svn/Foundation/src/WindowsConsoleChannel.cpp#2 $
-//
-// Library: Foundation
-// Package: Logging
-// Module:  WindowsConsoleChannel
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/WindowsConsoleChannel.h"
-#include "Poco/Message.h"
-#if defined(POCO_WIN32_UTF8)
-#include "Poco/UnicodeConverter.h"
-#endif
-
-
-namespace Poco {
-
-
-WindowsConsoleChannel::WindowsConsoleChannel():
-	_isFile(false),
-	_hConsole(INVALID_HANDLE_VALUE)
-{
-	_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-	// check whether the console has been redirected
-	DWORD mode;	
-	_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
-}
-
-
-WindowsConsoleChannel::~WindowsConsoleChannel()
-{
-}
-
-
-void WindowsConsoleChannel::log(const Message& msg)
-{
-	std::string text = msg.getText();
-	text += "\r\n";
-	
-#if defined(POCO_WIN32_UTF8)
-	if (_isFile)
-	{
-		DWORD written;
-		WriteFile(_hConsole, text.data(), text.size(), &written, NULL);	
-	}
-	else
-	{
-		std::wstring utext;
-		UnicodeConverter::toUTF16(text, utext);
-		DWORD written;
-		WriteConsoleW(_hConsole, utext.data(), utext.size(), &written, NULL);
-	}
-#else
-	DWORD written;
-	WriteFile(_hConsole, text.data(), text.size(), &written, NULL);	
-#endif
-}
-
-
-} // namespace Poco
+//
+// WindowsConsoleChannel.cpp
+//
+// $Id: //poco/svn/Foundation/src/WindowsConsoleChannel.cpp#2 $
+//
+// Library: Foundation
+// Package: Logging
+// Module:  WindowsConsoleChannel
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/WindowsConsoleChannel.h"
+#include "Poco/Message.h"
+#if defined(POCO_WIN32_UTF8)
+#include "Poco/UnicodeConverter.h"
+#endif
+
+
+namespace Poco {
+
+
+WindowsConsoleChannel::WindowsConsoleChannel():
+	_isFile(false),
+	_hConsole(INVALID_HANDLE_VALUE)
+{
+	_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+	// check whether the console has been redirected
+	DWORD mode;	
+	_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
+}
+
+
+WindowsConsoleChannel::~WindowsConsoleChannel()
+{
+}
+
+
+void WindowsConsoleChannel::log(const Message& msg)
+{
+	std::string text = msg.getText();
+	text += "\r\n";
+	
+#if defined(POCO_WIN32_UTF8)
+	if (_isFile)
+	{
+		DWORD written;
+		WriteFile(_hConsole, text.data(), text.size(), &written, NULL);	
+	}
+	else
+	{
+		std::wstring utext;
+		UnicodeConverter::toUTF16(text, utext);
+		DWORD written;
+		WriteConsoleW(_hConsole, utext.data(), utext.size(), &written, NULL);
+	}
+#else
+	DWORD written;
+	WriteFile(_hConsole, text.data(), text.size(), &written, NULL);	
+#endif
+}
+
+
+} // namespace Poco
diff --git a/Foundation/testsuite/src/AsyncIOChannelTest.cpp b/Foundation/testsuite/src/AsyncIOChannelTest.cpp
index 319f646a3..cc9a0f545 100644
--- a/Foundation/testsuite/src/AsyncIOChannelTest.cpp
+++ b/Foundation/testsuite/src/AsyncIOChannelTest.cpp
@@ -1,183 +1,183 @@
-//
-// AsyncIOChannelTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOChannelTest.cpp#2 $
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "AsyncIOChannelTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/AsyncStreamChannel.h"
-#include "Poco/AsyncIOCommand.h"
-#include "Poco/AsyncIOEvent.h"
-#include "Poco/Delegate.h"
-#include <sstream>
-
-
-using Poco::AsyncStreamChannel;
-using Poco::AsyncIOCommand;
-using Poco::AsyncReadCommand;
-using Poco::AsyncWriteCommand;
-using Poco::AsyncSeekCommand;
-using Poco::AsyncIOEvent;
-using Poco::ActiveResult;
-using Poco::delegate;
-
-
-AsyncIOChannelTest::AsyncIOChannelTest(const std::string& name): 
-	CppUnit::TestCase(name),
-	_completed(0),
-	_failed(0)
-{
-}
-
-
-AsyncIOChannelTest::~AsyncIOChannelTest()
-{
-}
-
-
-void AsyncIOChannelTest::testWrite()
-{
-	std::stringstream str;
-	AsyncStreamChannel channel(str);
-	channel.enqueue(new AsyncWriteCommand("Hello", 5));
-	channel.enqueue(new AsyncWriteCommand(", ", 2));
-	ActiveResult<int> result = channel.enqueue(new AsyncWriteCommand("world!", 6));
-	result.wait();
-	std::string s(str.str());
-	assert (s == "Hello, world!");
-}
-
-
-void AsyncIOChannelTest::testRead()
-{
-	std::istringstream istr("Hello, world!");
-	char buffer[16];
-	AsyncStreamChannel channel(istr);
-	ActiveResult<int> result = channel.enqueue(new AsyncReadCommand(buffer, sizeof(buffer)));
-	result.wait();
-	std::string s(buffer, result.data());
-	assert (s == "Hello, world!");
-}
-
-
-void AsyncIOChannelTest::testSeek()
-{
-	std::istringstream istr("Hello, world!");
-	char buffer[16];
-	AsyncStreamChannel channel(istr);
-	channel.enqueue(new AsyncSeekCommand(7, std::ios::beg));
-	ActiveResult<int> result = channel.enqueue(new AsyncReadCommand(buffer, 5));
-	result.wait();
-	std::string s(buffer, result.data());
-	assert (s == "world");
-}
-
-
-void AsyncIOChannelTest::testEvents()
-{
-	std::stringstream str;
-	AsyncStreamChannel channel(str);
-	AsyncIOCommand::Ptr pWrite(new AsyncWriteCommand("Hello, world!", 13));
-	pWrite->commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
-	channel.commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
-	assert (pWrite->state() == AsyncIOCommand::CMD_PENDING);
-	ActiveResult<int> result = channel.enqueue(pWrite);
-	pWrite->wait();
-	result.wait();
-	assert (pWrite->succeeded());
-	assert (!pWrite->failed());
-	assert (pWrite->state() == AsyncIOCommand::CMD_COMPLETED);
-	assert (pWrite->result() == 13);
-	assert (pWrite->exception() == 0);
-	assert (_completed == 2);
-	
-	reset();
-	
-	std::istringstream istr;
-	AsyncStreamChannel ichannel(istr);
-	pWrite = new AsyncWriteCommand("Hello, world!", 13);
-	pWrite->commandFailed += delegate(this, &AsyncIOChannelTest::onFailed);
-	ichannel.commandFailed += delegate(this, &AsyncIOChannelTest::onFailed);
-	pWrite->commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
-	ichannel.commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
-	assert (pWrite->state() == AsyncIOCommand::CMD_PENDING);
-	result = ichannel.enqueue(pWrite);
-	pWrite->wait();
-	result.wait();
-	assert (!pWrite->succeeded());
-	assert (pWrite->failed());
-	assert (pWrite->exception() != 0);
-	assert (_completed == 0);
-	assert (_failed == 2);
-}
-
-
-void AsyncIOChannelTest::setUp()
-{
-	reset();
-}
-
-
-void AsyncIOChannelTest::tearDown()
-{
-}
-
-
-void AsyncIOChannelTest::reset()
-{
-	_completed = 0;
-	_failed    = 0;
-}
-
-
-void AsyncIOChannelTest::onCompleted(const void* sender, Poco::AsyncIOEvent& event)
-{
-	++_completed;
-}
-
-
-void AsyncIOChannelTest::onFailed(const void* sender, Poco::AsyncIOEvent& event)
-{
-	++_failed;
-}
-
-
-CppUnit::Test* AsyncIOChannelTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("AsyncIOChannelTest");
-
-	CppUnit_addTest(pSuite, AsyncIOChannelTest, testWrite);
-	CppUnit_addTest(pSuite, AsyncIOChannelTest, testRead);
-	CppUnit_addTest(pSuite, AsyncIOChannelTest, testSeek);
-	CppUnit_addTest(pSuite, AsyncIOChannelTest, testEvents);
-
-	return pSuite;
-}
+//
+// AsyncIOChannelTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOChannelTest.cpp#2 $
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "AsyncIOChannelTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/AsyncStreamChannel.h"
+#include "Poco/AsyncIOCommand.h"
+#include "Poco/AsyncIOEvent.h"
+#include "Poco/Delegate.h"
+#include <sstream>
+
+
+using Poco::AsyncStreamChannel;
+using Poco::AsyncIOCommand;
+using Poco::AsyncReadCommand;
+using Poco::AsyncWriteCommand;
+using Poco::AsyncSeekCommand;
+using Poco::AsyncIOEvent;
+using Poco::ActiveResult;
+using Poco::delegate;
+
+
+AsyncIOChannelTest::AsyncIOChannelTest(const std::string& name): 
+	CppUnit::TestCase(name),
+	_completed(0),
+	_failed(0)
+{
+}
+
+
+AsyncIOChannelTest::~AsyncIOChannelTest()
+{
+}
+
+
+void AsyncIOChannelTest::testWrite()
+{
+	std::stringstream str;
+	AsyncStreamChannel channel(str);
+	channel.enqueue(new AsyncWriteCommand("Hello", 5));
+	channel.enqueue(new AsyncWriteCommand(", ", 2));
+	ActiveResult<int> result = channel.enqueue(new AsyncWriteCommand("world!", 6));
+	result.wait();
+	std::string s(str.str());
+	assert (s == "Hello, world!");
+}
+
+
+void AsyncIOChannelTest::testRead()
+{
+	std::istringstream istr("Hello, world!");
+	char buffer[16];
+	AsyncStreamChannel channel(istr);
+	ActiveResult<int> result = channel.enqueue(new AsyncReadCommand(buffer, sizeof(buffer)));
+	result.wait();
+	std::string s(buffer, result.data());
+	assert (s == "Hello, world!");
+}
+
+
+void AsyncIOChannelTest::testSeek()
+{
+	std::istringstream istr("Hello, world!");
+	char buffer[16];
+	AsyncStreamChannel channel(istr);
+	channel.enqueue(new AsyncSeekCommand(7, std::ios::beg));
+	ActiveResult<int> result = channel.enqueue(new AsyncReadCommand(buffer, 5));
+	result.wait();
+	std::string s(buffer, result.data());
+	assert (s == "world");
+}
+
+
+void AsyncIOChannelTest::testEvents()
+{
+	std::stringstream str;
+	AsyncStreamChannel channel(str);
+	AsyncIOCommand::Ptr pWrite(new AsyncWriteCommand("Hello, world!", 13));
+	pWrite->commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
+	channel.commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
+	assert (pWrite->state() == AsyncIOCommand::CMD_PENDING);
+	ActiveResult<int> result = channel.enqueue(pWrite);
+	pWrite->wait();
+	result.wait();
+	assert (pWrite->succeeded());
+	assert (!pWrite->failed());
+	assert (pWrite->state() == AsyncIOCommand::CMD_COMPLETED);
+	assert (pWrite->result() == 13);
+	assert (pWrite->exception() == 0);
+	assert (_completed == 2);
+	
+	reset();
+	
+	std::istringstream istr;
+	AsyncStreamChannel ichannel(istr);
+	pWrite = new AsyncWriteCommand("Hello, world!", 13);
+	pWrite->commandFailed += delegate(this, &AsyncIOChannelTest::onFailed);
+	ichannel.commandFailed += delegate(this, &AsyncIOChannelTest::onFailed);
+	pWrite->commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
+	ichannel.commandCompleted += delegate(this, &AsyncIOChannelTest::onCompleted);
+	assert (pWrite->state() == AsyncIOCommand::CMD_PENDING);
+	result = ichannel.enqueue(pWrite);
+	pWrite->wait();
+	result.wait();
+	assert (!pWrite->succeeded());
+	assert (pWrite->failed());
+	assert (pWrite->exception() != 0);
+	assert (_completed == 0);
+	assert (_failed == 2);
+}
+
+
+void AsyncIOChannelTest::setUp()
+{
+	reset();
+}
+
+
+void AsyncIOChannelTest::tearDown()
+{
+}
+
+
+void AsyncIOChannelTest::reset()
+{
+	_completed = 0;
+	_failed    = 0;
+}
+
+
+void AsyncIOChannelTest::onCompleted(const void* sender, Poco::AsyncIOEvent& event)
+{
+	++_completed;
+}
+
+
+void AsyncIOChannelTest::onFailed(const void* sender, Poco::AsyncIOEvent& event)
+{
+	++_failed;
+}
+
+
+CppUnit::Test* AsyncIOChannelTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("AsyncIOChannelTest");
+
+	CppUnit_addTest(pSuite, AsyncIOChannelTest, testWrite);
+	CppUnit_addTest(pSuite, AsyncIOChannelTest, testRead);
+	CppUnit_addTest(pSuite, AsyncIOChannelTest, testSeek);
+	CppUnit_addTest(pSuite, AsyncIOChannelTest, testEvents);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/AsyncIOChannelTest.h b/Foundation/testsuite/src/AsyncIOChannelTest.h
index 83fa91864..82d290aac 100644
--- a/Foundation/testsuite/src/AsyncIOChannelTest.h
+++ b/Foundation/testsuite/src/AsyncIOChannelTest.h
@@ -1,71 +1,71 @@
-//
-// AsyncIOChannelTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOChannelTest.h#2 $
-//
-// Definition of the AsyncIOChannelTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef AsyncIOChannelTest_INCLUDED
-#define AsyncIOChannelTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-#include "Poco/AsyncIOEvent.h"
-
-
-class AsyncIOChannelTest: public CppUnit::TestCase
-{
-public:
-	AsyncIOChannelTest(const std::string& name);
-	~AsyncIOChannelTest();
-
-	void testWrite();
-	void testRead();
-	void testSeek();
-	void testEvents();
-	
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-protected:
-	void reset();
-	void onCompleted(const void* sender, Poco::AsyncIOEvent& event);
-	void onFailed(const void* sender, Poco::AsyncIOEvent& event);
-	
-private:
-	int _completed;
-	int _failed;
-};
-
-
-#endif // AsyncIOChannelTest_INCLUDED
+//
+// AsyncIOChannelTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOChannelTest.h#2 $
+//
+// Definition of the AsyncIOChannelTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef AsyncIOChannelTest_INCLUDED
+#define AsyncIOChannelTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+#include "Poco/AsyncIOEvent.h"
+
+
+class AsyncIOChannelTest: public CppUnit::TestCase
+{
+public:
+	AsyncIOChannelTest(const std::string& name);
+	~AsyncIOChannelTest();
+
+	void testWrite();
+	void testRead();
+	void testSeek();
+	void testEvents();
+	
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+protected:
+	void reset();
+	void onCompleted(const void* sender, Poco::AsyncIOEvent& event);
+	void onFailed(const void* sender, Poco::AsyncIOEvent& event);
+	
+private:
+	int _completed;
+	int _failed;
+};
+
+
+#endif // AsyncIOChannelTest_INCLUDED
diff --git a/Foundation/testsuite/src/AsyncIOTestSuite.cpp b/Foundation/testsuite/src/AsyncIOTestSuite.cpp
index 7ad8b3bc8..2947654e5 100644
--- a/Foundation/testsuite/src/AsyncIOTestSuite.cpp
+++ b/Foundation/testsuite/src/AsyncIOTestSuite.cpp
@@ -1,44 +1,44 @@
-//
-// AsyncIOTestSuite.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOTestSuite.cpp#2 $
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "AsyncIOTestSuite.h"
-#include "AsyncIOChannelTest.h"
-
-
-CppUnit::Test* AsyncIOTestSuite::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("AsyncIOTestSuite");
-
-	pSuite->addTest(AsyncIOChannelTest::suite());
-
-	return pSuite;
-}
+//
+// AsyncIOTestSuite.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOTestSuite.cpp#2 $
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "AsyncIOTestSuite.h"
+#include "AsyncIOChannelTest.h"
+
+
+CppUnit::Test* AsyncIOTestSuite::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("AsyncIOTestSuite");
+
+	pSuite->addTest(AsyncIOChannelTest::suite());
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/AsyncIOTestSuite.h b/Foundation/testsuite/src/AsyncIOTestSuite.h
index 708e7c2d8..b63ceb908 100644
--- a/Foundation/testsuite/src/AsyncIOTestSuite.h
+++ b/Foundation/testsuite/src/AsyncIOTestSuite.h
@@ -1,49 +1,49 @@
-//
-// AsyncIOTestSuite.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOTestSuite.h#2 $
-//
-// Definition of the AsyncIOTestSuite class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef AsyncIOTestSuite_INCLUDED
-#define AsyncIOTestSuite_INCLUDED
-
-
-#include "CppUnit/TestSuite.h"
-
-
-class AsyncIOTestSuite
-{
-public:
-	static CppUnit::Test* suite();
-};
-
-
-#endif // AsyncIOTestSuite_INCLUDED
+//
+// AsyncIOTestSuite.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/AsyncIOTestSuite.h#2 $
+//
+// Definition of the AsyncIOTestSuite class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef AsyncIOTestSuite_INCLUDED
+#define AsyncIOTestSuite_INCLUDED
+
+
+#include "CppUnit/TestSuite.h"
+
+
+class AsyncIOTestSuite
+{
+public:
+	static CppUnit::Test* suite();
+};
+
+
+#endif // AsyncIOTestSuite_INCLUDED
diff --git a/Foundation/testsuite/src/ConditionTest.cpp b/Foundation/testsuite/src/ConditionTest.cpp
index 8cdf26408..56e6c2fba 100644
--- a/Foundation/testsuite/src/ConditionTest.cpp
+++ b/Foundation/testsuite/src/ConditionTest.cpp
@@ -1,214 +1,214 @@
-//
-// ConditionTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/ConditionTest.cpp#2 $
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "ConditionTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Thread.h"
-#include "Poco/Runnable.h"
-#include "Poco/Condition.h"
-#include "Poco/Mutex.h"
-#include "Poco/Exception.h"
-
-
-using Poco::Thread;
-using Poco::Runnable;
-using Poco::Condition;
-using Poco::Mutex;
-using Poco::TimeoutException;
-
-
-namespace
-{
-	class WaitRunnable: public Runnable
-	{
-	public:
-		WaitRunnable(Condition& cond, Mutex& mutex):
-			_ran(false),
-			_cond(cond),
-			_mutex(mutex)
-		{
-		}
-		
-		void run()
-		{
-			_mutex.lock();
-			_cond.wait(_mutex);
-			_mutex.unlock();
-			_ran = true;
-		}
-		
-		bool ran() const
-		{
-			return _ran;
-		}
-			
-	private:
-		bool _ran;
-		Condition& _cond;
-		Mutex& _mutex;
-	};
-	
-	class TryWaitRunnable: public Runnable
-	{
-	public:
-		TryWaitRunnable(Condition& cond, Mutex& mutex):
-			_ran(false),
-			_cond(cond),
-			_mutex(mutex)
-		{
-		}
-		
-		void run()
-		{
-			_mutex.lock();
-			if (_cond.tryWait(_mutex, 10000))
-			{
-				_ran = true;
-			}
-			_mutex.unlock();
-		}
-		
-		bool ran() const
-		{
-			return _ran;
-		}
-			
-	private:
-		bool _ran;
-		Condition& _cond;
-		Mutex& _mutex;
-	};
-
-}
-
-
-ConditionTest::ConditionTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-ConditionTest::~ConditionTest()
-{
-}
-
-
-void ConditionTest::testSignal()
-{
-	Condition cond;
-	Mutex mtx;
-	WaitRunnable r1(cond, mtx);
-	WaitRunnable r2(cond, mtx);
-	
-	Thread t1;
-	Thread t2;
-	
-	t1.start(r1);
-	Thread::sleep(200);
-	t2.start(r2);
-	
-	assert (!r1.ran());
-	assert (!r2.ran());
-	
-	cond.signal();
-	
-	t1.join();
-	assert (r1.ran());
-	
-	assert (!t2.tryJoin(200));
-	
-	cond.signal();
-	
-	t2.join();
-
-	assert (r2.ran());
-}
-
-
-void ConditionTest::testBroadcast()
-{
-	Condition cond;
-	Mutex mtx;
-	WaitRunnable r1(cond, mtx);
-	WaitRunnable r2(cond, mtx);
-	TryWaitRunnable r3(cond, mtx);
-	
-	Thread t1;
-	Thread t2;
-	Thread t3;
-	
-	t1.start(r1);
-	Thread::sleep(200);
-	t2.start(r2);
-	Thread::sleep(200);
-	t3.start(r3);
-	
-	assert (!r1.ran());
-	assert (!r2.ran());
-	assert (!r3.ran());
-	
-	cond.signal();
-	t1.join();
-	
-	assert (r1.ran());
-	assert (!t2.tryJoin(500));
-	assert (!t3.tryJoin(500));
-	
-	cond.broadcast();
-	
-	t2.join();
-	t3.join();
-	
-	assert (r2.ran());
-	assert (r3.ran());
-}
-
-
-void ConditionTest::setUp()
-{
-}
-
-
-void ConditionTest::tearDown()
-{
-}
-
-
-CppUnit::Test* ConditionTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ConditionTest");
-
-	CppUnit_addTest(pSuite, ConditionTest, testSignal);
-	CppUnit_addTest(pSuite, ConditionTest, testBroadcast);
-
-	return pSuite;
-}
+//
+// ConditionTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/ConditionTest.cpp#2 $
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "ConditionTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Thread.h"
+#include "Poco/Runnable.h"
+#include "Poco/Condition.h"
+#include "Poco/Mutex.h"
+#include "Poco/Exception.h"
+
+
+using Poco::Thread;
+using Poco::Runnable;
+using Poco::Condition;
+using Poco::Mutex;
+using Poco::TimeoutException;
+
+
+namespace
+{
+	class WaitRunnable: public Runnable
+	{
+	public:
+		WaitRunnable(Condition& cond, Mutex& mutex):
+			_ran(false),
+			_cond(cond),
+			_mutex(mutex)
+		{
+		}
+		
+		void run()
+		{
+			_mutex.lock();
+			_cond.wait(_mutex);
+			_mutex.unlock();
+			_ran = true;
+		}
+		
+		bool ran() const
+		{
+			return _ran;
+		}
+			
+	private:
+		bool _ran;
+		Condition& _cond;
+		Mutex& _mutex;
+	};
+	
+	class TryWaitRunnable: public Runnable
+	{
+	public:
+		TryWaitRunnable(Condition& cond, Mutex& mutex):
+			_ran(false),
+			_cond(cond),
+			_mutex(mutex)
+		{
+		}
+		
+		void run()
+		{
+			_mutex.lock();
+			if (_cond.tryWait(_mutex, 10000))
+			{
+				_ran = true;
+			}
+			_mutex.unlock();
+		}
+		
+		bool ran() const
+		{
+			return _ran;
+		}
+			
+	private:
+		bool _ran;
+		Condition& _cond;
+		Mutex& _mutex;
+	};
+
+}
+
+
+ConditionTest::ConditionTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+ConditionTest::~ConditionTest()
+{
+}
+
+
+void ConditionTest::testSignal()
+{
+	Condition cond;
+	Mutex mtx;
+	WaitRunnable r1(cond, mtx);
+	WaitRunnable r2(cond, mtx);
+	
+	Thread t1;
+	Thread t2;
+	
+	t1.start(r1);
+	Thread::sleep(200);
+	t2.start(r2);
+	
+	assert (!r1.ran());
+	assert (!r2.ran());
+	
+	cond.signal();
+	
+	t1.join();
+	assert (r1.ran());
+	
+	assert (!t2.tryJoin(200));
+	
+	cond.signal();
+	
+	t2.join();
+
+	assert (r2.ran());
+}
+
+
+void ConditionTest::testBroadcast()
+{
+	Condition cond;
+	Mutex mtx;
+	WaitRunnable r1(cond, mtx);
+	WaitRunnable r2(cond, mtx);
+	TryWaitRunnable r3(cond, mtx);
+	
+	Thread t1;
+	Thread t2;
+	Thread t3;
+	
+	t1.start(r1);
+	Thread::sleep(200);
+	t2.start(r2);
+	Thread::sleep(200);
+	t3.start(r3);
+	
+	assert (!r1.ran());
+	assert (!r2.ran());
+	assert (!r3.ran());
+	
+	cond.signal();
+	t1.join();
+	
+	assert (r1.ran());
+	assert (!t2.tryJoin(500));
+	assert (!t3.tryJoin(500));
+	
+	cond.broadcast();
+	
+	t2.join();
+	t3.join();
+	
+	assert (r2.ran());
+	assert (r3.ran());
+}
+
+
+void ConditionTest::setUp()
+{
+}
+
+
+void ConditionTest::tearDown()
+{
+}
+
+
+CppUnit::Test* ConditionTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ConditionTest");
+
+	CppUnit_addTest(pSuite, ConditionTest, testSignal);
+	CppUnit_addTest(pSuite, ConditionTest, testBroadcast);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/ConditionTest.h b/Foundation/testsuite/src/ConditionTest.h
index b99131aed..b026d263d 100644
--- a/Foundation/testsuite/src/ConditionTest.h
+++ b/Foundation/testsuite/src/ConditionTest.h
@@ -1,61 +1,61 @@
-//
-// ConditionTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/ConditionTest.h#2 $
-//
-// Definition of the ConditionTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef ConditionTest_INCLUDED
-#define ConditionTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class ConditionTest: public CppUnit::TestCase
-{
-public:
-	ConditionTest(const std::string& name);
-	~ConditionTest();
-
-	void testSignal();
-	void testBroadcast();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // ConditionTest_INCLUDED
+//
+// ConditionTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/ConditionTest.h#2 $
+//
+// Definition of the ConditionTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef ConditionTest_INCLUDED
+#define ConditionTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class ConditionTest: public CppUnit::TestCase
+{
+public:
+	ConditionTest(const std::string& name);
+	~ConditionTest();
+
+	void testSignal();
+	void testBroadcast();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // ConditionTest_INCLUDED
diff --git a/Foundation/testsuite/src/DynamicAnyTest.cpp b/Foundation/testsuite/src/DynamicAnyTest.cpp
index c0b760898..034c41e56 100644
--- a/Foundation/testsuite/src/DynamicAnyTest.cpp
+++ b/Foundation/testsuite/src/DynamicAnyTest.cpp
@@ -1,2267 +1,2267 @@
-//
-// DynamicAnyTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/DynamicAnyTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "DynamicAnyTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Exception.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/Bugcheck.h"
-#include "Poco/DynamicStruct.h"
-
-
-using namespace Poco;
-
-
-DynamicAnyTest::DynamicAnyTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-DynamicAnyTest::~DynamicAnyTest()
-{
-}
-
-
-void DynamicAnyTest::testInt8()
-{
-	Poco::Int8 src = 32;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(Poco::Int8));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-	
-	Int8 value = a1.extract<Int8>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testInt16()
-{
-	Poco::Int16 src = 32;
-	DynamicAny a1 = src;
-
-	assert (a1.type() == typeid(Poco::Int16));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	Int16 value = a1.extract<Int16>();
-	assert (value == 32);
-	
-	try
-	{
-		Int32 value2; value2 = a1.extract<Int32>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testInt32()
-{
-	Poco::Int32 src = 32;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(Poco::Int32));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-	
-	Int32 value = a1.extract<Int32>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testInt64()
-{
-	Poco::Int64 src = 32;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(Poco::Int64));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	Int64 value = a1.extract<Int64>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testUInt8()
-{
-	Poco::UInt8 src = 32;
-	DynamicAny a1 = src;
-
-	assert (a1.type() == typeid(Poco::UInt8));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	UInt8 value = a1.extract<UInt8>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testUInt16()
-{
-	Poco::UInt16 src = 32;
-	DynamicAny a1 = src;
-
-	assert (a1.type() == typeid(Poco::UInt16));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	UInt16 value = a1.extract<UInt16>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testUInt32()
-{
-	Poco::UInt32 src = 32;
-	DynamicAny a1 = src;
-
-	assert (a1.type() == typeid(Poco::UInt32));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	UInt32 value = a1.extract<UInt32>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testUInt64()
-{
-	Poco::UInt64 src = 32;
-	DynamicAny a1 = src;
-
-	assert (a1.type() == typeid(Poco::UInt64));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	UInt64 value = a1.extract<UInt64>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testBool()
-{
-	bool src = true;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(bool));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 1);
-	assert (s15 == 1);
-	assert (s1 == "true");
-	assert (s2 == 1);
-	assert (s3 == 1);
-	assert (s4 == 1);
-	assert (s5 == 1);
-	assert (s6 == 1);
-	assert (s7 == 1);
-	assert (s8 == 1);
-	assert (s9 == 1);
-	assert (s10 == 1.0f);
-	assert (s11 == 1.0);
-	assert (s12);
-	assert (s13 == '\x1');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	bool value = a1.extract<bool>();
-	assert (value);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-}
-
-
-void DynamicAnyTest::testChar()
-{
-	char src = ' ';
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(char));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == " ");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	char value = a1.extract<char>();
-	assert (value == ' ');
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-}
-
-
-void DynamicAnyTest::testFloat()
-{
-	float src = 32.0f;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(float));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	float value = a1.extract<float>();
-	assert (value == 32.0f);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1.0f;
-	assert (a3 == 33.0f);
-	a3 = a1 - 1.0f;
-	assert (a3 == 31.0f);
-	a3 += 1.0f;
-	assert (a3 == 32.0f);
-	a3 -= 1.0f;
-	assert (a3 == 31.0f);
-	a3 = a1 / 2.0f;
-	assert (a3 == 16.0f);
-	a3 = a1 * 2.0f;
-	assert (a3 == 64.0f);
-	a3 /= 2.0f;
-	assert (a3 == 32.0f);
-	a3 *= 2.0f;
-	assert (a3 == 64.0f);
-}
-
-
-void DynamicAnyTest::testDouble()
-{
-	double src = 32.0;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(double));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	double value = a1.extract<double>();
-	assert (value == 32.0);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	
-	DynamicAny a3 = a1 + 1.0;
-	assert (a3 == 33.0);
-	a3 = a1 - 1.0;
-	assert (a3 == 31.0);
-	a3 += 1.0;
-	assert (a3 == 32.0);
-	a3 -= 1.0;
-	assert (a3 == 31.0);
-	a3 = a1 / 2.0;
-	assert (a3 == 16.0);
-	a3 = a1 * 2.0;
-	assert (a3 == 64.0);
-	a3 /= 2.0;
-	assert (a3 == 32.0);
-	a3 *= 2.0;
-	assert (a3 == 64.0);
-}
-
-
-void DynamicAnyTest::testString()
-{
-	DynamicAny a1("32");
-	
-	assert (a1.type() == typeid(std::string));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == '3');
-
-	const std::string& value = a1.extract<std::string>();
-	assert (value == "32");
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a4(123);
-	std::string s("456");
-	DynamicAny a5 = a4 + s;
-	assert (a5 == "123456");
-	a4 += s;
-	assert (a4 == "123456");
-	DynamicAny a6 = a4 + "789";
-	assert (a6 == "123456789");
-	a4 += "789";
-	assert (a4 == "123456789");
-}
-
-
-void DynamicAnyTest::testLong()
-{
-	long src = 32;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(long));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-	
-	long value = a1.extract<long>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-
-void DynamicAnyTest::testULong()
-{
-	unsigned long src = 32;
-	DynamicAny a1 = src;
-	
-	assert (a1.type() == typeid(unsigned long));
-
-	std::string s1;
-	Poco::Int8 s2;
-	Poco::Int16 s3;
-	Poco::Int32 s4;
-	Poco::Int64 s5;
-	Poco::UInt8 s6;
-	Poco::UInt16 s7;
-	Poco::UInt32 s8;
-	Poco::UInt64 s9;
-	float s10;
-	double s11;
-	bool s12;
-	char s13;
-	a1.convert(s1);
-	a1.convert(s2);
-	a1.convert(s3);
-	a1.convert(s4);
-	a1.convert(s5);
-	a1.convert(s6);
-	a1.convert(s7);
-	a1.convert(s8);
-	a1.convert(s9);
-	a1.convert(s10);
-	a1.convert(s11);
-	a1.convert(s12);
-	a1.convert(s13);
-	long s14;
-	unsigned long s15;
-	a1.convert(s14);
-	a1.convert(s15);
-	assert (s14 == 32);
-	assert (s15 == 32);
-	assert (s1 == "32");
-	assert (s2 == 32);
-	assert (s3 == 32);
-	assert (s4 == 32);
-	assert (s5 == 32);
-	assert (s6 == 32);
-	assert (s7 == 32);
-	assert (s8 == 32);
-	assert (s9 == 32);
-	assert (s10 == 32.0f);
-	assert (s11 == 32.0);
-	assert (s12);
-	assert (s13 == ' ');
-	DynamicAny a2(a1);
-	std::string t2;
-	a2.convert(t2);
-	assert (s1 == t2);
-
-	unsigned long value = a1.extract<unsigned long>();
-	assert (value == 32);
-	
-	try
-	{
-		Int16 value2; value2 = a1.extract<Int16>();
-		fail("bad cast - must throw");
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	DynamicAny a3 = a1 + 1;
-	assert (a3 == 33);
-	a3 = a1 - 1;
-	assert (a3 == 31);
-	a3 += 1;
-	assert (a3 == 32);
-	a3 -= 1;
-	assert (a3 == 31);
-	a3 = a1 / 2;
-	assert (a3 == 16);
-	a3 = a1 * 2;
-	assert (a3 == 64);
-	a3 /= 2;
-	assert (a3 == 32);
-	a3 *= 2;
-	assert (a3 == 64);
-}
-
-	
-void DynamicAnyTest::testConversionOperator()
-{
-	DynamicAny any("42");
-	int i = any;
-	assert (i == 42);
-	assert (any == i);
-
-	any = 123;
-	std::string s = any;
-	assert (s == "123");
-	assert (s == any);
-	assert (any == s);
-	assert ("123" == any);
-
-	any = 321;
-	s = any.convert<std::string>();
-	assert (s == "321");
-
-	any = "456";
-	assert (any == "456");
-	assert ("456" == any);
-
-	DynamicAny any2 = "1.5";
-	double d = any2;
-	assert (d == 1.5);
-	assert (any2 == d);
-}
-
-
-void DynamicAnyTest::testComparisonOperators()
-{
-	DynamicAny any1 = 1;
-	DynamicAny any2 = "1";
-	assert (any1 == any2);
-	assert (any1 == 1);
-	assert (1 == any1);
-	assert (any1 == "1");
-	assert ("1" == any1);
-	assert (any1 <= 1);
-	assert (1 >= any1);
-	assert (any1 <= 2);
-	assert (2 >= any1);
-	assert (any1 < 2);
-	assert (2 > any1);
-	assert (any1 > 0);
-	assert (0 < any1);
-	assert (any1 >= 1);
-	assert (1 <= any1);
-	assert (any1 >= 0);
-	assert (0 <= any1);
-
-	any1 = 1L;
-	assert (any1 == any2);
-	assert (any1 == 1L);
-	assert (1L == any1);
-	assert (any1 == "1");
-	assert ("1" == any1);
-	assert (any1 != 2L);
-	assert (2L != any1);
-	assert (any1 != "2");
-	assert ("2" != any1);
-	assert (any1 <= 1L);
-	assert (1L >= any1);
-	assert (any1 <= 2L);
-	assert (2L >= any1);
-	assert (any1 < 2L);
-	assert (2L > any1);
-	assert (any1 > 0);
-	assert (0 < any1);
-	assert (any1 >= 1L);
-	assert (1L <= any1);
-	assert (any1 >= 0);
-	assert (0 <= any1);
-
-	any1 = 0x31;
-	assert (any1 == '1');
-	assert ('1' == any1);
-	assert (any1 <= '1');
-	assert ('1' >= any1);
-	assert (any1 <= '2');
-	assert ('2' >= any1);
-	assert (any1 < '2');
-	assert ('2' > any1);
-	assert (any1 > 0);
-	assert (0 < any1);
-	assert (any1 >= '1');
-	assert ('1' <= any1);
-	assert (any1 >= 0);
-	assert (0 <= any1);
-
-	any1 = "2";
-	assert (any1 != any2);
-	assert (any1 != 1);
-	assert (1 != any1);
-	assert (any1 != "1");
-	assert ("1" != any1);
-
-	any1 = 1.5;
-	assert (any1 == 1.5);
-	assert (1.5 == any1);
-	assert (any1 == "1.5");
-	assert ("1.5" == any1);
-	assert (any1 != 2.5);
-	assert (2.5 != any1);
-	assert (any1 != "2.5");
-	assert ("2.5" != any1);
-	assert (any1 <= 1.5);
-	assert (1.5 >= any1);
-	assert (any1 <= 2.5);
-	assert (2.5 >= any1);
-	assert (any1 < 2.5);
-	assert (2.5 > any1);
-	assert (any1 > 0);
-	assert (0 < any1);
-	assert (any1 >= 1.5);
-	assert (1.5 <= any1);
-	assert (any1 >= 0);
-	assert (0 <= any1);
-
-	any1 = 1.5f;
-	assert (any1 == 1.5f);
-	assert (1.5f == any1);
-	assert (any1 == "1.5");
-	assert ("1.5" == any1);
-	assert (any1 != 2.5f);
-	assert (2.5f != any1);
-	assert (any1 != "2.5");
-	assert ("2.5" != any1);
-	assert (any1 <= 1.5f);
-	assert (1.5f >= any1);
-	assert (any1 <= 2.5f);
-	assert (2.5f >= any1);
-	assert (any1 < 2.5f);
-	assert (2.5f > any1);
-	assert (any1 > 0);
-	assert (0 < any1);
-	assert (any1 >= 1.5f);
-	assert (1.5f <= any1);
-	assert (any1 >= 0);
-	assert (0 <= any1);
-}
-
-
-void DynamicAnyTest::testArithmeticOperators()
-{
-	DynamicAny any1 = 1;
-	DynamicAny any2 = 2;
-	DynamicAny any3 = any1 + any2;
-	assert (any3 == 3);
-	int i = 1;
-	i += any1;
-	assert (2 == i);
-
-	any1 = 3;
-	assert ((5 - any1) == 2);
-	any2 = 5;
-	any3 = any2 - any1;
-	assert (any3 == 2);
-	any3 -= 1;
-	assert (any3 == 1);
-	i = 5;
-	i -= any1;
-	assert (2 == i);
-
-	any1 = 3;
-	assert ((5 * any1) == 15);
-	any2 = 5;
-	any3 = any1 * any2;
-	assert (any3 == 15);
-	any3 *= 3;
-	assert (any3 == 45);
-	i = 5;
-	i *= any1;
-	assert (15 == i);
-
-	any1 = 3;
-	assert ((9 / any1) == 3);
-	any2 = 9;
-	any3 = any2 / any1;
-	assert (any3 == 3);
-	any3 /= 3;
-	assert (any3 == 1);
-	i = 9;
-	i /= any1;
-	assert (3 == i);
-
-	any1 = 1.0f;
-	any2 = .5f;
-	any3 = .0f;
-	any3 = any1 + any2;
-	assert (any3 == 1.5f);
-	any3 += .5f;
-	assert (any3 == 2.0f);
-
-	any1 = 1.0;
-	any2 = .5;
-	any3 = 0.0;
-	any3 = any1 + any2;
-	assert (any3 == 1.5);
-	any3 += .5;
-	assert (any3 == 2.0);
-
-	any1 = 1;
-	any2 = "2";
-	any3 = any1 + any2;
-	assert (any3 == 3);
-	any2 = "4";
-	any3 += any2;
-	assert (any3 == 7);
-	assert (1 + any3 == 8);
-
-	any1 = "123";
-	any2 = "456";
-	any3 = any1 + any2;
-	assert (any3 == "123456");
-	any2 = "789";
-	any3 += any2;
-	assert (any3 == "123456789");
-	assert (("xyz" + any3) == "xyz123456789");
-
-	try	{ any3 = any1 - any2; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-
-	try	{ any3 -= any2;	fail ("must fail");	} 
-	catch (InvalidArgumentException&){}
-
-	try	{ any3 = any1 * any2; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-
-	try { any3 *= any2;	fail ("must fail");	} 
-	catch (InvalidArgumentException&){}
-
-	try { any3 = any1 / any2; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-
-	try { any3 /= any2; fail ("must fail");	} 
-	catch (InvalidArgumentException&){}
-
-	any1 = 10;
-	
-	assert (any1++ == 10);
-	assert (any1 == 11);
-	assert (++any1 == 12);
-
-	assert (any1-- == 12);
-	assert (any1 == 11);
-	assert (--any1 == 10);
-
-	any1 = 1.23;
-
-	try { ++any1; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-	
-	try { any1++; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-
-	try { --any1; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-	
-	try { any1--; fail ("must fail"); } 
-	catch (InvalidArgumentException&){}
-}
-
-
-void DynamicAnyTest::testLimitsInt()
-{
-	testLimitsSigned<Int16, Int8>();
-	testLimitsSigned<Int32, Int8>();
-	testLimitsSigned<Int64, Int8>();
-	testLimitsFloatToInt<float, Int8>();
-	testLimitsFloatToInt<double, Int8>();
-
-	testLimitsSigned<Int32, Int16>();
-	testLimitsSigned<Int64, Int16>();
-	testLimitsFloatToInt<float, Int16>();
-	testLimitsFloatToInt<double, Int16>();
-
-	testLimitsSigned<Int64, Int32>();
-	testLimitsFloatToInt<float, Int32>();
-	testLimitsFloatToInt<double, Int32>();
-
-	testLimitsSignedUnsigned<Int8, UInt8>();
-	testLimitsSignedUnsigned<Int16, UInt8>();
-	testLimitsSignedUnsigned<Int32, UInt8>();
-	testLimitsSignedUnsigned<Int64, UInt8>();
-	testLimitsFloatToInt<float, UInt8>();
-	testLimitsFloatToInt<double, UInt8>();
-
-	testLimitsSignedUnsigned<Int8, UInt16>();
-	testLimitsSignedUnsigned<Int16, UInt16>();
-	testLimitsSignedUnsigned<Int32, UInt16>();
-	testLimitsSignedUnsigned<Int64, UInt16>();
-	testLimitsFloatToInt<float, UInt16>();
-	testLimitsFloatToInt<double, UInt16>();
-
-	testLimitsSignedUnsigned<Int8, UInt32>();
-	testLimitsSignedUnsigned<Int16, UInt32>();
-	testLimitsSignedUnsigned<Int32, UInt32>();
-	testLimitsSignedUnsigned<Int64, UInt32>();
-	testLimitsFloatToInt<float, UInt32>();
-	testLimitsFloatToInt<double, UInt32>();
-
-	testLimitsSignedUnsigned<Int8, UInt64>();
-	testLimitsSignedUnsigned<Int16, UInt64>();
-	testLimitsSignedUnsigned<Int32, UInt64>();
-	testLimitsSignedUnsigned<Int64, UInt64>();
-	testLimitsFloatToInt<float, UInt64>();
-	testLimitsFloatToInt<double, UInt64>();
-
-
-	testLimitsUnsigned<UInt16, UInt8>();
-	testLimitsUnsigned<UInt32, UInt8>();
-	testLimitsUnsigned<UInt64, UInt8>();
-
-	testLimitsUnsigned<UInt32, UInt16>();
-	testLimitsUnsigned<UInt64, UInt16>();
-
-	testLimitsUnsigned<UInt64, UInt32>();
-}
-
-
-void DynamicAnyTest::testLimitsFloat()
-{
-	if (std::numeric_limits<double>::max() != std::numeric_limits<float>::max())
-	{
-		double iMin = -1 * std::numeric_limits<float>::max();
-		DynamicAny da = iMin * 10;
-		try { float f; f = da; fail("must fail"); }
-		catch (RangeException&) {}
-
-		double iMax = std::numeric_limits<float>::max();
-		da = iMax * 10;
-		try { float f; f = da; fail("must fail"); }
-		catch (RangeException&) {}
-	}
-}
-
-
-void DynamicAnyTest::testCtor()
-{
-	// this is mainly to test a reported compiler error with assignment on HP aCC.
-	// (SF# 1733964)
-
-	DynamicAny a1(42);
-	DynamicAny a2(a1);
-	DynamicAny a3;
-	
-	a3 = a1;
-	
-	assert (a2 == 42);
-	assert (a3 == 42);
-}
-
-
-void DynamicAnyTest::testIsStruct()
-{
-	std::string s1("string");
-	Poco::Int8 s2(-23);
-	Poco::Int16 s3(-33);
-	Poco::Int32 s4(-388);
-	Poco::Int64 s5(-23823838);
-	Poco::UInt8 s6(32);
-	Poco::UInt16 s7(16000);
-	Poco::UInt32 s8(334234);
-	Poco::UInt64 s9(2328328382);
-	float s10(13.333f);
-	double s11(13.555);
-	bool s12(true);
-	char s13('c');
-	long s14(232323);
-	unsigned long s15(21233232);
-	std::vector<DynamicAny> s16;
-	DynamicStruct s17;
-
-	DynamicAny d1(s1);
-	DynamicAny d2(s2);
-	DynamicAny d3(s3);
-	DynamicAny d4(s4);
-	DynamicAny d5(s5);
-	DynamicAny d6(s6);
-	DynamicAny d7(s7);
-	DynamicAny d8(s8);
-	DynamicAny d9(s9);
-	DynamicAny d10(s10);
-	DynamicAny d11(s11);
-	DynamicAny d12(s12);
-	DynamicAny d13(s13);
-	DynamicAny d14(s14);
-	DynamicAny d15(s15);
-	DynamicAny d16(s16);
-	DynamicAny d17(s17);
-
-	assert (!d1.isStruct());
-	assert (!d2.isStruct());
-	assert (!d3.isStruct());
-	assert (!d4.isStruct());
-	assert (!d5.isStruct());
-	assert (!d6.isStruct());
-	assert (!d7.isStruct());
-	assert (!d8.isStruct());
-	assert (!d9.isStruct());
-	assert (!d10.isStruct());
-	assert (!d11.isStruct());
-	assert (!d12.isStruct());
-	assert (!d13.isStruct());
-	assert (!d14.isStruct());
-	assert (!d15.isStruct());
-	assert (!d16.isStruct());
-	assert (d17.isStruct());
-}
-
-
-void DynamicAnyTest::testIsArray()
-{
-	std::string s1("string");
-	Poco::Int8 s2(-23);
-	Poco::Int16 s3(-33);
-	Poco::Int32 s4(-388);
-	Poco::Int64 s5(-23823838);
-	Poco::UInt8 s6(32);
-	Poco::UInt16 s7(16000);
-	Poco::UInt32 s8(334234);
-	Poco::UInt64 s9(2328328382);
-	float s10(13.333f);
-	double s11(13.555);
-	bool s12(true);
-	char s13('c');
-	long s14(232323);
-	unsigned long s15(21233232);
-	std::vector<DynamicAny> s16;
-	DynamicStruct s17;
-
-	DynamicAny d1(s1);
-	DynamicAny d2(s2);
-	DynamicAny d3(s3);
-	DynamicAny d4(s4);
-	DynamicAny d5(s5);
-	DynamicAny d6(s6);
-	DynamicAny d7(s7);
-	DynamicAny d8(s8);
-	DynamicAny d9(s9);
-	DynamicAny d10(s10);
-	DynamicAny d11(s11);
-	DynamicAny d12(s12);
-	DynamicAny d13(s13);
-	DynamicAny d14(s14);
-	DynamicAny d15(s15);
-	DynamicAny d16(s16);
-	DynamicAny d17(s17);
-
-	assert (!d1.isArray());
-	assert (!d2.isArray());
-	assert (!d3.isArray());
-	assert (!d4.isArray());
-	assert (!d5.isArray());
-	assert (!d6.isArray());
-	assert (!d7.isArray());
-	assert (!d8.isArray());
-	assert (!d9.isArray());
-	assert (!d10.isArray());
-	assert (!d11.isArray());
-	assert (!d12.isArray());
-	assert (!d13.isArray());
-	assert (!d14.isArray());
-	assert (!d15.isArray());
-	assert (d16.isArray());
-	assert (!d17.isArray());
-}
-
-
-void DynamicAnyTest::testArrayIdxOperator()
-{
-	std::string s1("string");
-	Poco::Int8 s2(-23);
-	Poco::Int16 s3(-33);
-	Poco::Int32 s4(-388);
-	Poco::Int64 s5(-23823838);
-	Poco::UInt8 s6(32);
-	Poco::UInt16 s7(16000);
-	Poco::UInt32 s8(334234);
-	Poco::UInt64 s9(2328328382);
-	float s10(13.333f);
-	double s11(13.555);
-	bool s12(true);
-	char s13('c');
-	long s14(232323);
-	unsigned long s15(21233232);
-	std::vector<DynamicAny> s16;
-	s16.push_back(s1);
-	s16.push_back(s2);
-	DynamicStruct s17;
-
-	DynamicAny d1(s1);
-	DynamicAny d2(s2);
-	DynamicAny d3(s3);
-	DynamicAny d4(s4);
-	DynamicAny d5(s5);
-	DynamicAny d6(s6);
-	DynamicAny d7(s7);
-	DynamicAny d8(s8);
-	DynamicAny d9(s9);
-	DynamicAny d10(s10);
-	DynamicAny d11(s11);
-	DynamicAny d12(s12);
-	DynamicAny d13(s13);
-	DynamicAny d14(s14);
-	DynamicAny d15(s15);
-	DynamicAny d16(s16);
-	DynamicAny d17(s17);
-
-	testGetIdxMustThrow(d1, 0);
-	testGetIdxMustThrow(d2, 0);
-	testGetIdxMustThrow(d3, 0);
-	testGetIdxMustThrow(d4, 0);
-	testGetIdxMustThrow(d5, 0);
-	testGetIdxMustThrow(d6, 0);
-	testGetIdxMustThrow(d7, 0);
-	testGetIdxMustThrow(d8, 0);
-	testGetIdxMustThrow(d9, 0);
-	testGetIdxMustThrow(d10, 0);
-	testGetIdxMustThrow(d11, 0);
-	testGetIdxMustThrow(d12, 0);
-	testGetIdxMustThrow(d13, 0);
-	testGetIdxMustThrow(d14, 0);
-	testGetIdxMustThrow(d15, 0);
-	testGetIdx(d16, 0, s1);
-	testGetIdx(d16, 1, s2);
-	testGetIdxMustThrow(d17, 0);
-}
-
-
-void DynamicAnyTest::testDynamicStructBasics()
-{
-	DynamicStruct aStruct;
-	assert (aStruct.empty());
-	assert (aStruct.size() == 0);
-	assert (aStruct.members().empty());
-
-	aStruct.insert("First Name", "Little");
-	assert (!aStruct.empty());
-	assert (aStruct.size() == 1);
-	assert (*(aStruct.members().begin()) == "First Name");
-	assert (aStruct["First Name"] == "Little");
-	aStruct.insert("Last Name", "POCO");
-	assert (aStruct.members().size() == 2);
-	aStruct.erase("First Name");
-	assert (aStruct.size() == 1);
-	assert (*(aStruct.members().begin()) == "Last Name");
-}
-
-
-void DynamicAnyTest::testDynamicStruct()
-{
-	DynamicStruct aStruct;
-	aStruct["First Name"] = "Junior";
-	aStruct["Last Name"] = "POCO";
-	DynamicAny a1(aStruct);
-	assert (a1["First Name"] == "Junior");
-	assert (a1["Last Name"] == "POCO");
-	a1["First Name"] = "Senior";
-	assert (a1["First Name"] == "Senior");
-	testGetIdxMustThrow(a1, 0);
-}
-
-
-void DynamicAnyTest::testArrayToString()
-{
-	std::string s1("string");
-	Poco::Int8 s2(23);
-	std::vector<DynamicAny> s16;
-	s16.push_back(s1);
-	s16.push_back(s2);
-	DynamicAny a1(s16);
-	std::string res = a1.convert<std::string>();
-	std::string expected("[ 'string', 23 ]");
-	assert (res == expected);
-}
-
-
-void DynamicAnyTest::testStructToString()
-{
-	DynamicStruct aStruct;
-	aStruct["First Name"] = "Junior";
-	aStruct["Last Name"] = "POCO";
-	aStruct["Age"] = 1;
-	DynamicAny a1(aStruct);
-	std::string res = a1.convert<std::string>();
-	std::string expected = "{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }";
-;
-	assert (res == expected);
-}
-
-
-void DynamicAnyTest::testArrayOfStructsToString()
-{
-	std::vector<DynamicAny> s16;
-	DynamicStruct aStruct;
-	aStruct["First Name"] = "Junior";
-	aStruct["Last Name"] = "POCO";
-	aStruct["Age"] = 1;
-	s16.push_back(aStruct);
-	aStruct["First Name"] = "Senior";
-	aStruct["Last Name"] = "POCO";
-	aStruct["Age"] = 100;
-	s16.push_back(aStruct);
-	std::vector<DynamicAny> s16Cpy = s16;
-	// recursive arrays!
-	s16Cpy.push_back(s16);
-	s16.push_back(s16Cpy);
-	DynamicAny a1(s16);
-	std::string res = a1.convert<std::string>();
-	std::string expected = "[ "
-						"{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }, "
-						"{ 'Age' : 100, 'First Name' : 'Senior', 'Last Name' : 'POCO' }, "
-							"[ "
-							"{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }, "
-							"{ 'Age' : 100, 'First Name' : 'Senior', 'Last Name' : 'POCO' }, "
-								"[ "
-								"{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }, "
-								"{ 'Age' : 100, 'First Name' : 'Senior', 'Last Name' : 'POCO' } "
-								"] ] ]";
-	
-	assert (res == expected);
-}
-
-
-void DynamicAnyTest::testStructWithArraysToString()
-{
-	std::string s1("string");
-	Poco::Int8 s2(23);
-	std::vector<DynamicAny> s16;
-	s16.push_back(s1);
-	s16.push_back(s2);
-	DynamicAny a1(s16);
-	DynamicStruct addr;
-	addr["Number"] = 4;
-	addr["Street"] = "Unknown";
-	addr["Country"] = "Carinthia";
-	DynamicStruct aStruct;
-	aStruct["First Name"] = "Junior";
-	aStruct["Last Name"] = a1;
-	aStruct["Age"] = 1;
-	aStruct["Address"] = addr;
-	DynamicAny a2(aStruct);
-	std::string res = a2.convert<std::string>();
-	std::string expected = "{ 'Address' : { 'Country' : 'Carinthia', 'Number' : 4, 'Street' : 'Unknown' }, "
-								"'Age' : 1, 'First Name' : 'Junior', 'Last Name' : [ 'string', 23 ] }";
-
-	assert (res == expected);
-}
-
-
-void DynamicAnyTest::testJSONDeserializeString()
-{
-	DynamicAny a("test");
-	std::string tst = DynamicAny::toString(a);
-	DynamicAny b = DynamicAny::parse(tst);
-	assert (b.convert<std::string>() == "test");
-
-	DynamicAny c('c');
-	std::string tst2 = DynamicAny::toString(c);
-	DynamicAny b2 = DynamicAny::parse(tst2);
-	char cc = b2.convert<char>();
-	assert (cc == 'c');
-}
-
-
-void DynamicAnyTest::testJSONDeserializePrimitives()
-{
-	Poco::Int8 i8(-12);
-	Poco::UInt16 u16(2345);
-	Poco::Int32 i32(-24343);
-	Poco::UInt64 u64(1234567890);
-	u64 *= u64;
-	bool b = false;
-	float f = 3.1415f;
-	double d = 3.1415;
-
-	std::string s8 = DynamicAny::toString(i8);
-	std::string s16 = DynamicAny::toString(u16);
-	std::string s32 = DynamicAny::toString(i32);
-	std::string s64 = DynamicAny::toString(u64);
-	std::string sb = DynamicAny::toString(b);
-	std::string sf = DynamicAny::toString(f);
-	std::string sd = DynamicAny::toString(d);
-	DynamicAny a8 = DynamicAny::parse(s8);
-	DynamicAny a16 = DynamicAny::parse(s16);
-	DynamicAny a32 = DynamicAny::parse(s32);
-	DynamicAny a64 = DynamicAny::parse(s64);
-	DynamicAny ab = DynamicAny::parse(sb);
-	DynamicAny af = DynamicAny::parse(sf);
-	DynamicAny ad = DynamicAny::parse(sd);
-	assert (a8 == i8);
-	assert (a16 == u16);
-	assert (a32 == i32);
-	assert (a64 == u64);
-	assert (ab == b);
-	assert (af == f);
-	assert (ad == d);
-}
-
-
-void DynamicAnyTest::testJSONDeserializeArray()
-{
-	Poco::Int8 i8(-12);
-	Poco::UInt16 u16(2345);
-	Poco::Int32 i32(-24343);
-	Poco::UInt64 u64(1234567890);
-	u64 *= u64;
-	bool b = false;
-	float f = 3.1415f;
-	double d = 3.1415;
-	std::string s("test string");
-	char c('x');
-	std::vector<DynamicAny> aVec;
-	aVec.push_back(i8);
-	aVec.push_back(u16);
-	aVec.push_back(i32);
-	aVec.push_back(u64);
-	aVec.push_back(b);
-	aVec.push_back(f);
-	aVec.push_back(d);
-	aVec.push_back(s);
-	aVec.push_back(c);
-
-	std::string sVec = DynamicAny::toString(aVec);
-	DynamicAny a = DynamicAny::parse(sVec);
-	assert (a[0] == i8);
-	assert (a[1] == u16);
-	assert (a[2] == i32);
-	assert (a[3] == u64);
-	assert (a[4] == b);
-	assert (a[5] == f);
-	assert (a[6] == d);
-	assert (a[7] == s);
-	assert (a[8] == c);
-}
-
-
-void DynamicAnyTest::testJSONDeserializeComplex()
-{
-	Poco::Int8 i8(-12);
-	Poco::UInt16 u16(2345);
-	Poco::Int32 i32(-24343);
-	Poco::UInt64 u64(1234567890);
-	u64 *= u64;
-	bool b = false;
-	float f = 3.1415f;
-	double d = 3.1415;
-	std::string s("test string");
-	char c('x');
-	DynamicStruct aStr;
-	aStr["i8"] = i8;
-	aStr["u16"] = u16;
-	aStr["i32"] = i32;
-	aStr["u64"] = u64;
-	aStr["b"] = b;
-	aStr["f"] = f;
-	aStr["d"] = d;
-	aStr["s"] = s;
-	aStr["c"] = c;
-	std::vector<DynamicAny> aVec;
-	aVec.push_back(i8);
-	aVec.push_back(u16);
-	aVec.push_back(i32);
-	aVec.push_back(u64);
-	aVec.push_back(b);
-	aVec.push_back(f);
-	aVec.push_back(d);
-	aVec.push_back(s);
-	aVec.push_back(c);
-	aVec.push_back(aStr);
-	aStr["vec"] = aVec;
-
-	std::string sStr = DynamicAny::toString(aStr);
-	DynamicAny a = DynamicAny::parse(sStr);
-	assert (a.isStruct());
-	assert (aStr["i8"] == i8);
-	assert (aStr["u16"] == u16);
-	assert (aStr["i32"] == i32);
-	assert (aStr["u64"] == u64);
-	assert (aStr["b"] == b);
-	assert (aStr["f"] == f);
-	assert (aStr["d"] == d);
-	assert (aStr["s"] == s);
-	assert (aStr["c"] == c);
-	DynamicAny vecRet = a["vec"];
-	assert (vecRet.isArray());
-	assert (vecRet[0] == i8);
-	assert (vecRet[1] == u16);
-	assert (vecRet[2] == i32);
-	assert (vecRet[3] == u64);
-	assert (vecRet[4] == b);
-	assert (vecRet[5] == f);
-	assert (vecRet[6] == d);
-	assert (vecRet[7] == s);
-	assert (vecRet[8] == c);
-	DynamicAny strRet = vecRet[9];
-	assert (strRet.isStruct());
-}
-
-
-void DynamicAnyTest::testJSONDeserializeStruct()
-{
-	Poco::Int8 i8(-12);
-	Poco::UInt16 u16(2345);
-	Poco::Int32 i32(-24343);
-	Poco::UInt64 u64(1234567890);
-	u64 *= u64;
-	bool b = false;
-	float f = 3.1415f;
-	double d = 3.1415;
-	std::string s("test string");
-	char c('x');
-	DynamicStruct aStr;
-	aStr["i8"] = i8;
-	aStr["u16"] = u16;
-	aStr["i32"] = i32;
-	aStr["u64"] = u64;
-	aStr["b"] = b;
-	aStr["f"] = f;
-	aStr["d"] = d;
-	aStr["s"] = s;
-	aStr["c"] = c;
-
-	std::string sStr = DynamicAny::toString(aStr);
-	DynamicAny a = DynamicAny::parse(sStr);
-	assert (aStr["i8"] == i8);
-	assert (aStr["u16"] == u16);
-	assert (aStr["i32"] == i32);
-	assert (aStr["u64"] == u64);
-	assert (aStr["b"] == b);
-	assert (aStr["f"] == f);
-	assert (aStr["d"] == d);
-	assert (aStr["s"] == s);
-	assert (aStr["c"] == c);
-}
-
-
-void DynamicAnyTest::testDate()
-{
-	Poco::DateTime dtNow(2007, 3, 13, 8, 12, 15);
-	
-	Poco::Timestamp tsNow = dtNow.timestamp();
-	Poco::LocalDateTime ldtNow(dtNow.timestamp());
-	DynamicAny dt(dtNow);
-	DynamicAny ts(tsNow);
-	DynamicAny ldt(ldtNow);
-	DynamicAny dtStr(dt.convert<std::string>());
-	DynamicAny tsStr(ts.convert<std::string>());
-	DynamicAny ldtStr(ldt.convert<std::string>());
-	DateTime dtRes = dtStr.convert<DateTime>();
-	LocalDateTime ldtRes = ldtStr.convert<LocalDateTime>();
-	Timestamp tsRes = tsStr.convert<Timestamp>();
-	assert (dtNow == dtRes);
-	assert (ldtNow == ldtRes);
-	assert (tsNow == tsRes);
-}
-
-void DynamicAnyTest::testGetIdxMustThrow(DynamicAny& a1, std::vector<DynamicAny>::size_type n)
-{
-	try
-	{
-		DynamicAny& val1 = a1[n]; 
-		fail("bad cast - must throw");
-		val1 = 0; // silence the compiler
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-
-	try
-	{
-		const DynamicAny& c1 = a1;
-		const DynamicAny& cval1 = c1[n]; 
-		fail("bad const cast - must throw");
-		assert (cval1 == c1); // silence the compiler
-	}
-	catch (Poco::BadCastException&)
-	{
-	}
-}
-
-
-void DynamicAnyTest::setUp()
-{
-}
-
-
-void DynamicAnyTest::tearDown()
-{
-}
-
-
-CppUnit::Test* DynamicAnyTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("DynamicAnyTest");
-
-	CppUnit_addTest(pSuite, DynamicAnyTest, testInt8);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testInt16);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testInt32);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testInt64);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt8);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt16);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt32);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt64);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testBool);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testChar);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testFloat);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testDouble);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testString);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testLong);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testULong);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testConversionOperator);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testComparisonOperators);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testArithmeticOperators);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testLimitsInt);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testLimitsFloat);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testCtor);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testIsStruct);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testIsArray);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testArrayIdxOperator);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testDynamicStructBasics);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testDynamicStruct);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testArrayToString);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testStructToString);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testArrayOfStructsToString);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testStructWithArraysToString);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeString);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializePrimitives);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeArray);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeStruct);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeComplex);
-	CppUnit_addTest(pSuite, DynamicAnyTest, testDate);
-
-	return pSuite;
-}
+//
+// DynamicAnyTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/DynamicAnyTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "DynamicAnyTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Exception.h"
+#include "Poco/DynamicAny.h"
+#include "Poco/Bugcheck.h"
+#include "Poco/DynamicStruct.h"
+
+
+using namespace Poco;
+
+
+DynamicAnyTest::DynamicAnyTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+DynamicAnyTest::~DynamicAnyTest()
+{
+}
+
+
+void DynamicAnyTest::testInt8()
+{
+	Poco::Int8 src = 32;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(Poco::Int8));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+	
+	Int8 value = a1.extract<Int8>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testInt16()
+{
+	Poco::Int16 src = 32;
+	DynamicAny a1 = src;
+
+	assert (a1.type() == typeid(Poco::Int16));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	Int16 value = a1.extract<Int16>();
+	assert (value == 32);
+	
+	try
+	{
+		Int32 value2; value2 = a1.extract<Int32>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testInt32()
+{
+	Poco::Int32 src = 32;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(Poco::Int32));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+	
+	Int32 value = a1.extract<Int32>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testInt64()
+{
+	Poco::Int64 src = 32;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(Poco::Int64));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	Int64 value = a1.extract<Int64>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testUInt8()
+{
+	Poco::UInt8 src = 32;
+	DynamicAny a1 = src;
+
+	assert (a1.type() == typeid(Poco::UInt8));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	UInt8 value = a1.extract<UInt8>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testUInt16()
+{
+	Poco::UInt16 src = 32;
+	DynamicAny a1 = src;
+
+	assert (a1.type() == typeid(Poco::UInt16));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	UInt16 value = a1.extract<UInt16>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testUInt32()
+{
+	Poco::UInt32 src = 32;
+	DynamicAny a1 = src;
+
+	assert (a1.type() == typeid(Poco::UInt32));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	UInt32 value = a1.extract<UInt32>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testUInt64()
+{
+	Poco::UInt64 src = 32;
+	DynamicAny a1 = src;
+
+	assert (a1.type() == typeid(Poco::UInt64));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	UInt64 value = a1.extract<UInt64>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testBool()
+{
+	bool src = true;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(bool));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 1);
+	assert (s15 == 1);
+	assert (s1 == "true");
+	assert (s2 == 1);
+	assert (s3 == 1);
+	assert (s4 == 1);
+	assert (s5 == 1);
+	assert (s6 == 1);
+	assert (s7 == 1);
+	assert (s8 == 1);
+	assert (s9 == 1);
+	assert (s10 == 1.0f);
+	assert (s11 == 1.0);
+	assert (s12);
+	assert (s13 == '\x1');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	bool value = a1.extract<bool>();
+	assert (value);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+}
+
+
+void DynamicAnyTest::testChar()
+{
+	char src = ' ';
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(char));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == " ");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	char value = a1.extract<char>();
+	assert (value == ' ');
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+}
+
+
+void DynamicAnyTest::testFloat()
+{
+	float src = 32.0f;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(float));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	float value = a1.extract<float>();
+	assert (value == 32.0f);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1.0f;
+	assert (a3 == 33.0f);
+	a3 = a1 - 1.0f;
+	assert (a3 == 31.0f);
+	a3 += 1.0f;
+	assert (a3 == 32.0f);
+	a3 -= 1.0f;
+	assert (a3 == 31.0f);
+	a3 = a1 / 2.0f;
+	assert (a3 == 16.0f);
+	a3 = a1 * 2.0f;
+	assert (a3 == 64.0f);
+	a3 /= 2.0f;
+	assert (a3 == 32.0f);
+	a3 *= 2.0f;
+	assert (a3 == 64.0f);
+}
+
+
+void DynamicAnyTest::testDouble()
+{
+	double src = 32.0;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(double));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	double value = a1.extract<double>();
+	assert (value == 32.0);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	
+	DynamicAny a3 = a1 + 1.0;
+	assert (a3 == 33.0);
+	a3 = a1 - 1.0;
+	assert (a3 == 31.0);
+	a3 += 1.0;
+	assert (a3 == 32.0);
+	a3 -= 1.0;
+	assert (a3 == 31.0);
+	a3 = a1 / 2.0;
+	assert (a3 == 16.0);
+	a3 = a1 * 2.0;
+	assert (a3 == 64.0);
+	a3 /= 2.0;
+	assert (a3 == 32.0);
+	a3 *= 2.0;
+	assert (a3 == 64.0);
+}
+
+
+void DynamicAnyTest::testString()
+{
+	DynamicAny a1("32");
+	
+	assert (a1.type() == typeid(std::string));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == '3');
+
+	const std::string& value = a1.extract<std::string>();
+	assert (value == "32");
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a4(123);
+	std::string s("456");
+	DynamicAny a5 = a4 + s;
+	assert (a5 == "123456");
+	a4 += s;
+	assert (a4 == "123456");
+	DynamicAny a6 = a4 + "789";
+	assert (a6 == "123456789");
+	a4 += "789";
+	assert (a4 == "123456789");
+}
+
+
+void DynamicAnyTest::testLong()
+{
+	long src = 32;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(long));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+	
+	long value = a1.extract<long>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+
+void DynamicAnyTest::testULong()
+{
+	unsigned long src = 32;
+	DynamicAny a1 = src;
+	
+	assert (a1.type() == typeid(unsigned long));
+
+	std::string s1;
+	Poco::Int8 s2;
+	Poco::Int16 s3;
+	Poco::Int32 s4;
+	Poco::Int64 s5;
+	Poco::UInt8 s6;
+	Poco::UInt16 s7;
+	Poco::UInt32 s8;
+	Poco::UInt64 s9;
+	float s10;
+	double s11;
+	bool s12;
+	char s13;
+	a1.convert(s1);
+	a1.convert(s2);
+	a1.convert(s3);
+	a1.convert(s4);
+	a1.convert(s5);
+	a1.convert(s6);
+	a1.convert(s7);
+	a1.convert(s8);
+	a1.convert(s9);
+	a1.convert(s10);
+	a1.convert(s11);
+	a1.convert(s12);
+	a1.convert(s13);
+	long s14;
+	unsigned long s15;
+	a1.convert(s14);
+	a1.convert(s15);
+	assert (s14 == 32);
+	assert (s15 == 32);
+	assert (s1 == "32");
+	assert (s2 == 32);
+	assert (s3 == 32);
+	assert (s4 == 32);
+	assert (s5 == 32);
+	assert (s6 == 32);
+	assert (s7 == 32);
+	assert (s8 == 32);
+	assert (s9 == 32);
+	assert (s10 == 32.0f);
+	assert (s11 == 32.0);
+	assert (s12);
+	assert (s13 == ' ');
+	DynamicAny a2(a1);
+	std::string t2;
+	a2.convert(t2);
+	assert (s1 == t2);
+
+	unsigned long value = a1.extract<unsigned long>();
+	assert (value == 32);
+	
+	try
+	{
+		Int16 value2; value2 = a1.extract<Int16>();
+		fail("bad cast - must throw");
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	DynamicAny a3 = a1 + 1;
+	assert (a3 == 33);
+	a3 = a1 - 1;
+	assert (a3 == 31);
+	a3 += 1;
+	assert (a3 == 32);
+	a3 -= 1;
+	assert (a3 == 31);
+	a3 = a1 / 2;
+	assert (a3 == 16);
+	a3 = a1 * 2;
+	assert (a3 == 64);
+	a3 /= 2;
+	assert (a3 == 32);
+	a3 *= 2;
+	assert (a3 == 64);
+}
+
+	
+void DynamicAnyTest::testConversionOperator()
+{
+	DynamicAny any("42");
+	int i = any;
+	assert (i == 42);
+	assert (any == i);
+
+	any = 123;
+	std::string s = any;
+	assert (s == "123");
+	assert (s == any);
+	assert (any == s);
+	assert ("123" == any);
+
+	any = 321;
+	s = any.convert<std::string>();
+	assert (s == "321");
+
+	any = "456";
+	assert (any == "456");
+	assert ("456" == any);
+
+	DynamicAny any2 = "1.5";
+	double d = any2;
+	assert (d == 1.5);
+	assert (any2 == d);
+}
+
+
+void DynamicAnyTest::testComparisonOperators()
+{
+	DynamicAny any1 = 1;
+	DynamicAny any2 = "1";
+	assert (any1 == any2);
+	assert (any1 == 1);
+	assert (1 == any1);
+	assert (any1 == "1");
+	assert ("1" == any1);
+	assert (any1 <= 1);
+	assert (1 >= any1);
+	assert (any1 <= 2);
+	assert (2 >= any1);
+	assert (any1 < 2);
+	assert (2 > any1);
+	assert (any1 > 0);
+	assert (0 < any1);
+	assert (any1 >= 1);
+	assert (1 <= any1);
+	assert (any1 >= 0);
+	assert (0 <= any1);
+
+	any1 = 1L;
+	assert (any1 == any2);
+	assert (any1 == 1L);
+	assert (1L == any1);
+	assert (any1 == "1");
+	assert ("1" == any1);
+	assert (any1 != 2L);
+	assert (2L != any1);
+	assert (any1 != "2");
+	assert ("2" != any1);
+	assert (any1 <= 1L);
+	assert (1L >= any1);
+	assert (any1 <= 2L);
+	assert (2L >= any1);
+	assert (any1 < 2L);
+	assert (2L > any1);
+	assert (any1 > 0);
+	assert (0 < any1);
+	assert (any1 >= 1L);
+	assert (1L <= any1);
+	assert (any1 >= 0);
+	assert (0 <= any1);
+
+	any1 = 0x31;
+	assert (any1 == '1');
+	assert ('1' == any1);
+	assert (any1 <= '1');
+	assert ('1' >= any1);
+	assert (any1 <= '2');
+	assert ('2' >= any1);
+	assert (any1 < '2');
+	assert ('2' > any1);
+	assert (any1 > 0);
+	assert (0 < any1);
+	assert (any1 >= '1');
+	assert ('1' <= any1);
+	assert (any1 >= 0);
+	assert (0 <= any1);
+
+	any1 = "2";
+	assert (any1 != any2);
+	assert (any1 != 1);
+	assert (1 != any1);
+	assert (any1 != "1");
+	assert ("1" != any1);
+
+	any1 = 1.5;
+	assert (any1 == 1.5);
+	assert (1.5 == any1);
+	assert (any1 == "1.5");
+	assert ("1.5" == any1);
+	assert (any1 != 2.5);
+	assert (2.5 != any1);
+	assert (any1 != "2.5");
+	assert ("2.5" != any1);
+	assert (any1 <= 1.5);
+	assert (1.5 >= any1);
+	assert (any1 <= 2.5);
+	assert (2.5 >= any1);
+	assert (any1 < 2.5);
+	assert (2.5 > any1);
+	assert (any1 > 0);
+	assert (0 < any1);
+	assert (any1 >= 1.5);
+	assert (1.5 <= any1);
+	assert (any1 >= 0);
+	assert (0 <= any1);
+
+	any1 = 1.5f;
+	assert (any1 == 1.5f);
+	assert (1.5f == any1);
+	assert (any1 == "1.5");
+	assert ("1.5" == any1);
+	assert (any1 != 2.5f);
+	assert (2.5f != any1);
+	assert (any1 != "2.5");
+	assert ("2.5" != any1);
+	assert (any1 <= 1.5f);
+	assert (1.5f >= any1);
+	assert (any1 <= 2.5f);
+	assert (2.5f >= any1);
+	assert (any1 < 2.5f);
+	assert (2.5f > any1);
+	assert (any1 > 0);
+	assert (0 < any1);
+	assert (any1 >= 1.5f);
+	assert (1.5f <= any1);
+	assert (any1 >= 0);
+	assert (0 <= any1);
+}
+
+
+void DynamicAnyTest::testArithmeticOperators()
+{
+	DynamicAny any1 = 1;
+	DynamicAny any2 = 2;
+	DynamicAny any3 = any1 + any2;
+	assert (any3 == 3);
+	int i = 1;
+	i += any1;
+	assert (2 == i);
+
+	any1 = 3;
+	assert ((5 - any1) == 2);
+	any2 = 5;
+	any3 = any2 - any1;
+	assert (any3 == 2);
+	any3 -= 1;
+	assert (any3 == 1);
+	i = 5;
+	i -= any1;
+	assert (2 == i);
+
+	any1 = 3;
+	assert ((5 * any1) == 15);
+	any2 = 5;
+	any3 = any1 * any2;
+	assert (any3 == 15);
+	any3 *= 3;
+	assert (any3 == 45);
+	i = 5;
+	i *= any1;
+	assert (15 == i);
+
+	any1 = 3;
+	assert ((9 / any1) == 3);
+	any2 = 9;
+	any3 = any2 / any1;
+	assert (any3 == 3);
+	any3 /= 3;
+	assert (any3 == 1);
+	i = 9;
+	i /= any1;
+	assert (3 == i);
+
+	any1 = 1.0f;
+	any2 = .5f;
+	any3 = .0f;
+	any3 = any1 + any2;
+	assert (any3 == 1.5f);
+	any3 += .5f;
+	assert (any3 == 2.0f);
+
+	any1 = 1.0;
+	any2 = .5;
+	any3 = 0.0;
+	any3 = any1 + any2;
+	assert (any3 == 1.5);
+	any3 += .5;
+	assert (any3 == 2.0);
+
+	any1 = 1;
+	any2 = "2";
+	any3 = any1 + any2;
+	assert (any3 == 3);
+	any2 = "4";
+	any3 += any2;
+	assert (any3 == 7);
+	assert (1 + any3 == 8);
+
+	any1 = "123";
+	any2 = "456";
+	any3 = any1 + any2;
+	assert (any3 == "123456");
+	any2 = "789";
+	any3 += any2;
+	assert (any3 == "123456789");
+	assert (("xyz" + any3) == "xyz123456789");
+
+	try	{ any3 = any1 - any2; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+
+	try	{ any3 -= any2;	fail ("must fail");	} 
+	catch (InvalidArgumentException&){}
+
+	try	{ any3 = any1 * any2; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+
+	try { any3 *= any2;	fail ("must fail");	} 
+	catch (InvalidArgumentException&){}
+
+	try { any3 = any1 / any2; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+
+	try { any3 /= any2; fail ("must fail");	} 
+	catch (InvalidArgumentException&){}
+
+	any1 = 10;
+	
+	assert (any1++ == 10);
+	assert (any1 == 11);
+	assert (++any1 == 12);
+
+	assert (any1-- == 12);
+	assert (any1 == 11);
+	assert (--any1 == 10);
+
+	any1 = 1.23;
+
+	try { ++any1; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+	
+	try { any1++; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+
+	try { --any1; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+	
+	try { any1--; fail ("must fail"); } 
+	catch (InvalidArgumentException&){}
+}
+
+
+void DynamicAnyTest::testLimitsInt()
+{
+	testLimitsSigned<Int16, Int8>();
+	testLimitsSigned<Int32, Int8>();
+	testLimitsSigned<Int64, Int8>();
+	testLimitsFloatToInt<float, Int8>();
+	testLimitsFloatToInt<double, Int8>();
+
+	testLimitsSigned<Int32, Int16>();
+	testLimitsSigned<Int64, Int16>();
+	testLimitsFloatToInt<float, Int16>();
+	testLimitsFloatToInt<double, Int16>();
+
+	testLimitsSigned<Int64, Int32>();
+	testLimitsFloatToInt<float, Int32>();
+	testLimitsFloatToInt<double, Int32>();
+
+	testLimitsSignedUnsigned<Int8, UInt8>();
+	testLimitsSignedUnsigned<Int16, UInt8>();
+	testLimitsSignedUnsigned<Int32, UInt8>();
+	testLimitsSignedUnsigned<Int64, UInt8>();
+	testLimitsFloatToInt<float, UInt8>();
+	testLimitsFloatToInt<double, UInt8>();
+
+	testLimitsSignedUnsigned<Int8, UInt16>();
+	testLimitsSignedUnsigned<Int16, UInt16>();
+	testLimitsSignedUnsigned<Int32, UInt16>();
+	testLimitsSignedUnsigned<Int64, UInt16>();
+	testLimitsFloatToInt<float, UInt16>();
+	testLimitsFloatToInt<double, UInt16>();
+
+	testLimitsSignedUnsigned<Int8, UInt32>();
+	testLimitsSignedUnsigned<Int16, UInt32>();
+	testLimitsSignedUnsigned<Int32, UInt32>();
+	testLimitsSignedUnsigned<Int64, UInt32>();
+	testLimitsFloatToInt<float, UInt32>();
+	testLimitsFloatToInt<double, UInt32>();
+
+	testLimitsSignedUnsigned<Int8, UInt64>();
+	testLimitsSignedUnsigned<Int16, UInt64>();
+	testLimitsSignedUnsigned<Int32, UInt64>();
+	testLimitsSignedUnsigned<Int64, UInt64>();
+	testLimitsFloatToInt<float, UInt64>();
+	testLimitsFloatToInt<double, UInt64>();
+
+
+	testLimitsUnsigned<UInt16, UInt8>();
+	testLimitsUnsigned<UInt32, UInt8>();
+	testLimitsUnsigned<UInt64, UInt8>();
+
+	testLimitsUnsigned<UInt32, UInt16>();
+	testLimitsUnsigned<UInt64, UInt16>();
+
+	testLimitsUnsigned<UInt64, UInt32>();
+}
+
+
+void DynamicAnyTest::testLimitsFloat()
+{
+	if (std::numeric_limits<double>::max() != std::numeric_limits<float>::max())
+	{
+		double iMin = -1 * std::numeric_limits<float>::max();
+		DynamicAny da = iMin * 10;
+		try { float f; f = da; fail("must fail"); }
+		catch (RangeException&) {}
+
+		double iMax = std::numeric_limits<float>::max();
+		da = iMax * 10;
+		try { float f; f = da; fail("must fail"); }
+		catch (RangeException&) {}
+	}
+}
+
+
+void DynamicAnyTest::testCtor()
+{
+	// this is mainly to test a reported compiler error with assignment on HP aCC.
+	// (SF# 1733964)
+
+	DynamicAny a1(42);
+	DynamicAny a2(a1);
+	DynamicAny a3;
+	
+	a3 = a1;
+	
+	assert (a2 == 42);
+	assert (a3 == 42);
+}
+
+
+void DynamicAnyTest::testIsStruct()
+{
+	std::string s1("string");
+	Poco::Int8 s2(-23);
+	Poco::Int16 s3(-33);
+	Poco::Int32 s4(-388);
+	Poco::Int64 s5(-23823838);
+	Poco::UInt8 s6(32);
+	Poco::UInt16 s7(16000);
+	Poco::UInt32 s8(334234);
+	Poco::UInt64 s9(2328328382);
+	float s10(13.333f);
+	double s11(13.555);
+	bool s12(true);
+	char s13('c');
+	long s14(232323);
+	unsigned long s15(21233232);
+	std::vector<DynamicAny> s16;
+	DynamicStruct s17;
+
+	DynamicAny d1(s1);
+	DynamicAny d2(s2);
+	DynamicAny d3(s3);
+	DynamicAny d4(s4);
+	DynamicAny d5(s5);
+	DynamicAny d6(s6);
+	DynamicAny d7(s7);
+	DynamicAny d8(s8);
+	DynamicAny d9(s9);
+	DynamicAny d10(s10);
+	DynamicAny d11(s11);
+	DynamicAny d12(s12);
+	DynamicAny d13(s13);
+	DynamicAny d14(s14);
+	DynamicAny d15(s15);
+	DynamicAny d16(s16);
+	DynamicAny d17(s17);
+
+	assert (!d1.isStruct());
+	assert (!d2.isStruct());
+	assert (!d3.isStruct());
+	assert (!d4.isStruct());
+	assert (!d5.isStruct());
+	assert (!d6.isStruct());
+	assert (!d7.isStruct());
+	assert (!d8.isStruct());
+	assert (!d9.isStruct());
+	assert (!d10.isStruct());
+	assert (!d11.isStruct());
+	assert (!d12.isStruct());
+	assert (!d13.isStruct());
+	assert (!d14.isStruct());
+	assert (!d15.isStruct());
+	assert (!d16.isStruct());
+	assert (d17.isStruct());
+}
+
+
+void DynamicAnyTest::testIsArray()
+{
+	std::string s1("string");
+	Poco::Int8 s2(-23);
+	Poco::Int16 s3(-33);
+	Poco::Int32 s4(-388);
+	Poco::Int64 s5(-23823838);
+	Poco::UInt8 s6(32);
+	Poco::UInt16 s7(16000);
+	Poco::UInt32 s8(334234);
+	Poco::UInt64 s9(2328328382);
+	float s10(13.333f);
+	double s11(13.555);
+	bool s12(true);
+	char s13('c');
+	long s14(232323);
+	unsigned long s15(21233232);
+	std::vector<DynamicAny> s16;
+	DynamicStruct s17;
+
+	DynamicAny d1(s1);
+	DynamicAny d2(s2);
+	DynamicAny d3(s3);
+	DynamicAny d4(s4);
+	DynamicAny d5(s5);
+	DynamicAny d6(s6);
+	DynamicAny d7(s7);
+	DynamicAny d8(s8);
+	DynamicAny d9(s9);
+	DynamicAny d10(s10);
+	DynamicAny d11(s11);
+	DynamicAny d12(s12);
+	DynamicAny d13(s13);
+	DynamicAny d14(s14);
+	DynamicAny d15(s15);
+	DynamicAny d16(s16);
+	DynamicAny d17(s17);
+
+	assert (!d1.isArray());
+	assert (!d2.isArray());
+	assert (!d3.isArray());
+	assert (!d4.isArray());
+	assert (!d5.isArray());
+	assert (!d6.isArray());
+	assert (!d7.isArray());
+	assert (!d8.isArray());
+	assert (!d9.isArray());
+	assert (!d10.isArray());
+	assert (!d11.isArray());
+	assert (!d12.isArray());
+	assert (!d13.isArray());
+	assert (!d14.isArray());
+	assert (!d15.isArray());
+	assert (d16.isArray());
+	assert (!d17.isArray());
+}
+
+
+void DynamicAnyTest::testArrayIdxOperator()
+{
+	std::string s1("string");
+	Poco::Int8 s2(-23);
+	Poco::Int16 s3(-33);
+	Poco::Int32 s4(-388);
+	Poco::Int64 s5(-23823838);
+	Poco::UInt8 s6(32);
+	Poco::UInt16 s7(16000);
+	Poco::UInt32 s8(334234);
+	Poco::UInt64 s9(2328328382);
+	float s10(13.333f);
+	double s11(13.555);
+	bool s12(true);
+	char s13('c');
+	long s14(232323);
+	unsigned long s15(21233232);
+	std::vector<DynamicAny> s16;
+	s16.push_back(s1);
+	s16.push_back(s2);
+	DynamicStruct s17;
+
+	DynamicAny d1(s1);
+	DynamicAny d2(s2);
+	DynamicAny d3(s3);
+	DynamicAny d4(s4);
+	DynamicAny d5(s5);
+	DynamicAny d6(s6);
+	DynamicAny d7(s7);
+	DynamicAny d8(s8);
+	DynamicAny d9(s9);
+	DynamicAny d10(s10);
+	DynamicAny d11(s11);
+	DynamicAny d12(s12);
+	DynamicAny d13(s13);
+	DynamicAny d14(s14);
+	DynamicAny d15(s15);
+	DynamicAny d16(s16);
+	DynamicAny d17(s17);
+
+	testGetIdxMustThrow(d1, 0);
+	testGetIdxMustThrow(d2, 0);
+	testGetIdxMustThrow(d3, 0);
+	testGetIdxMustThrow(d4, 0);
+	testGetIdxMustThrow(d5, 0);
+	testGetIdxMustThrow(d6, 0);
+	testGetIdxMustThrow(d7, 0);
+	testGetIdxMustThrow(d8, 0);
+	testGetIdxMustThrow(d9, 0);
+	testGetIdxMustThrow(d10, 0);
+	testGetIdxMustThrow(d11, 0);
+	testGetIdxMustThrow(d12, 0);
+	testGetIdxMustThrow(d13, 0);
+	testGetIdxMustThrow(d14, 0);
+	testGetIdxMustThrow(d15, 0);
+	testGetIdx(d16, 0, s1);
+	testGetIdx(d16, 1, s2);
+	testGetIdxMustThrow(d17, 0);
+}
+
+
+void DynamicAnyTest::testDynamicStructBasics()
+{
+	DynamicStruct aStruct;
+	assert (aStruct.empty());
+	assert (aStruct.size() == 0);
+	assert (aStruct.members().empty());
+
+	aStruct.insert("First Name", "Little");
+	assert (!aStruct.empty());
+	assert (aStruct.size() == 1);
+	assert (*(aStruct.members().begin()) == "First Name");
+	assert (aStruct["First Name"] == "Little");
+	aStruct.insert("Last Name", "POCO");
+	assert (aStruct.members().size() == 2);
+	aStruct.erase("First Name");
+	assert (aStruct.size() == 1);
+	assert (*(aStruct.members().begin()) == "Last Name");
+}
+
+
+void DynamicAnyTest::testDynamicStruct()
+{
+	DynamicStruct aStruct;
+	aStruct["First Name"] = "Junior";
+	aStruct["Last Name"] = "POCO";
+	DynamicAny a1(aStruct);
+	assert (a1["First Name"] == "Junior");
+	assert (a1["Last Name"] == "POCO");
+	a1["First Name"] = "Senior";
+	assert (a1["First Name"] == "Senior");
+	testGetIdxMustThrow(a1, 0);
+}
+
+
+void DynamicAnyTest::testArrayToString()
+{
+	std::string s1("string");
+	Poco::Int8 s2(23);
+	std::vector<DynamicAny> s16;
+	s16.push_back(s1);
+	s16.push_back(s2);
+	DynamicAny a1(s16);
+	std::string res = a1.convert<std::string>();
+	std::string expected("[ 'string', 23 ]");
+	assert (res == expected);
+}
+
+
+void DynamicAnyTest::testStructToString()
+{
+	DynamicStruct aStruct;
+	aStruct["First Name"] = "Junior";
+	aStruct["Last Name"] = "POCO";
+	aStruct["Age"] = 1;
+	DynamicAny a1(aStruct);
+	std::string res = a1.convert<std::string>();
+	std::string expected = "{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }";
+;
+	assert (res == expected);
+}
+
+
+void DynamicAnyTest::testArrayOfStructsToString()
+{
+	std::vector<DynamicAny> s16;
+	DynamicStruct aStruct;
+	aStruct["First Name"] = "Junior";
+	aStruct["Last Name"] = "POCO";
+	aStruct["Age"] = 1;
+	s16.push_back(aStruct);
+	aStruct["First Name"] = "Senior";
+	aStruct["Last Name"] = "POCO";
+	aStruct["Age"] = 100;
+	s16.push_back(aStruct);
+	std::vector<DynamicAny> s16Cpy = s16;
+	// recursive arrays!
+	s16Cpy.push_back(s16);
+	s16.push_back(s16Cpy);
+	DynamicAny a1(s16);
+	std::string res = a1.convert<std::string>();
+	std::string expected = "[ "
+						"{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }, "
+						"{ 'Age' : 100, 'First Name' : 'Senior', 'Last Name' : 'POCO' }, "
+							"[ "
+							"{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }, "
+							"{ 'Age' : 100, 'First Name' : 'Senior', 'Last Name' : 'POCO' }, "
+								"[ "
+								"{ 'Age' : 1, 'First Name' : 'Junior', 'Last Name' : 'POCO' }, "
+								"{ 'Age' : 100, 'First Name' : 'Senior', 'Last Name' : 'POCO' } "
+								"] ] ]";
+	
+	assert (res == expected);
+}
+
+
+void DynamicAnyTest::testStructWithArraysToString()
+{
+	std::string s1("string");
+	Poco::Int8 s2(23);
+	std::vector<DynamicAny> s16;
+	s16.push_back(s1);
+	s16.push_back(s2);
+	DynamicAny a1(s16);
+	DynamicStruct addr;
+	addr["Number"] = 4;
+	addr["Street"] = "Unknown";
+	addr["Country"] = "Carinthia";
+	DynamicStruct aStruct;
+	aStruct["First Name"] = "Junior";
+	aStruct["Last Name"] = a1;
+	aStruct["Age"] = 1;
+	aStruct["Address"] = addr;
+	DynamicAny a2(aStruct);
+	std::string res = a2.convert<std::string>();
+	std::string expected = "{ 'Address' : { 'Country' : 'Carinthia', 'Number' : 4, 'Street' : 'Unknown' }, "
+								"'Age' : 1, 'First Name' : 'Junior', 'Last Name' : [ 'string', 23 ] }";
+
+	assert (res == expected);
+}
+
+
+void DynamicAnyTest::testJSONDeserializeString()
+{
+	DynamicAny a("test");
+	std::string tst = DynamicAny::toString(a);
+	DynamicAny b = DynamicAny::parse(tst);
+	assert (b.convert<std::string>() == "test");
+
+	DynamicAny c('c');
+	std::string tst2 = DynamicAny::toString(c);
+	DynamicAny b2 = DynamicAny::parse(tst2);
+	char cc = b2.convert<char>();
+	assert (cc == 'c');
+}
+
+
+void DynamicAnyTest::testJSONDeserializePrimitives()
+{
+	Poco::Int8 i8(-12);
+	Poco::UInt16 u16(2345);
+	Poco::Int32 i32(-24343);
+	Poco::UInt64 u64(1234567890);
+	u64 *= u64;
+	bool b = false;
+	float f = 3.1415f;
+	double d = 3.1415;
+
+	std::string s8 = DynamicAny::toString(i8);
+	std::string s16 = DynamicAny::toString(u16);
+	std::string s32 = DynamicAny::toString(i32);
+	std::string s64 = DynamicAny::toString(u64);
+	std::string sb = DynamicAny::toString(b);
+	std::string sf = DynamicAny::toString(f);
+	std::string sd = DynamicAny::toString(d);
+	DynamicAny a8 = DynamicAny::parse(s8);
+	DynamicAny a16 = DynamicAny::parse(s16);
+	DynamicAny a32 = DynamicAny::parse(s32);
+	DynamicAny a64 = DynamicAny::parse(s64);
+	DynamicAny ab = DynamicAny::parse(sb);
+	DynamicAny af = DynamicAny::parse(sf);
+	DynamicAny ad = DynamicAny::parse(sd);
+	assert (a8 == i8);
+	assert (a16 == u16);
+	assert (a32 == i32);
+	assert (a64 == u64);
+	assert (ab == b);
+	assert (af == f);
+	assert (ad == d);
+}
+
+
+void DynamicAnyTest::testJSONDeserializeArray()
+{
+	Poco::Int8 i8(-12);
+	Poco::UInt16 u16(2345);
+	Poco::Int32 i32(-24343);
+	Poco::UInt64 u64(1234567890);
+	u64 *= u64;
+	bool b = false;
+	float f = 3.1415f;
+	double d = 3.1415;
+	std::string s("test string");
+	char c('x');
+	std::vector<DynamicAny> aVec;
+	aVec.push_back(i8);
+	aVec.push_back(u16);
+	aVec.push_back(i32);
+	aVec.push_back(u64);
+	aVec.push_back(b);
+	aVec.push_back(f);
+	aVec.push_back(d);
+	aVec.push_back(s);
+	aVec.push_back(c);
+
+	std::string sVec = DynamicAny::toString(aVec);
+	DynamicAny a = DynamicAny::parse(sVec);
+	assert (a[0] == i8);
+	assert (a[1] == u16);
+	assert (a[2] == i32);
+	assert (a[3] == u64);
+	assert (a[4] == b);
+	assert (a[5] == f);
+	assert (a[6] == d);
+	assert (a[7] == s);
+	assert (a[8] == c);
+}
+
+
+void DynamicAnyTest::testJSONDeserializeComplex()
+{
+	Poco::Int8 i8(-12);
+	Poco::UInt16 u16(2345);
+	Poco::Int32 i32(-24343);
+	Poco::UInt64 u64(1234567890);
+	u64 *= u64;
+	bool b = false;
+	float f = 3.1415f;
+	double d = 3.1415;
+	std::string s("test string");
+	char c('x');
+	DynamicStruct aStr;
+	aStr["i8"] = i8;
+	aStr["u16"] = u16;
+	aStr["i32"] = i32;
+	aStr["u64"] = u64;
+	aStr["b"] = b;
+	aStr["f"] = f;
+	aStr["d"] = d;
+	aStr["s"] = s;
+	aStr["c"] = c;
+	std::vector<DynamicAny> aVec;
+	aVec.push_back(i8);
+	aVec.push_back(u16);
+	aVec.push_back(i32);
+	aVec.push_back(u64);
+	aVec.push_back(b);
+	aVec.push_back(f);
+	aVec.push_back(d);
+	aVec.push_back(s);
+	aVec.push_back(c);
+	aVec.push_back(aStr);
+	aStr["vec"] = aVec;
+
+	std::string sStr = DynamicAny::toString(aStr);
+	DynamicAny a = DynamicAny::parse(sStr);
+	assert (a.isStruct());
+	assert (aStr["i8"] == i8);
+	assert (aStr["u16"] == u16);
+	assert (aStr["i32"] == i32);
+	assert (aStr["u64"] == u64);
+	assert (aStr["b"] == b);
+	assert (aStr["f"] == f);
+	assert (aStr["d"] == d);
+	assert (aStr["s"] == s);
+	assert (aStr["c"] == c);
+	DynamicAny vecRet = a["vec"];
+	assert (vecRet.isArray());
+	assert (vecRet[0] == i8);
+	assert (vecRet[1] == u16);
+	assert (vecRet[2] == i32);
+	assert (vecRet[3] == u64);
+	assert (vecRet[4] == b);
+	assert (vecRet[5] == f);
+	assert (vecRet[6] == d);
+	assert (vecRet[7] == s);
+	assert (vecRet[8] == c);
+	DynamicAny strRet = vecRet[9];
+	assert (strRet.isStruct());
+}
+
+
+void DynamicAnyTest::testJSONDeserializeStruct()
+{
+	Poco::Int8 i8(-12);
+	Poco::UInt16 u16(2345);
+	Poco::Int32 i32(-24343);
+	Poco::UInt64 u64(1234567890);
+	u64 *= u64;
+	bool b = false;
+	float f = 3.1415f;
+	double d = 3.1415;
+	std::string s("test string");
+	char c('x');
+	DynamicStruct aStr;
+	aStr["i8"] = i8;
+	aStr["u16"] = u16;
+	aStr["i32"] = i32;
+	aStr["u64"] = u64;
+	aStr["b"] = b;
+	aStr["f"] = f;
+	aStr["d"] = d;
+	aStr["s"] = s;
+	aStr["c"] = c;
+
+	std::string sStr = DynamicAny::toString(aStr);
+	DynamicAny a = DynamicAny::parse(sStr);
+	assert (aStr["i8"] == i8);
+	assert (aStr["u16"] == u16);
+	assert (aStr["i32"] == i32);
+	assert (aStr["u64"] == u64);
+	assert (aStr["b"] == b);
+	assert (aStr["f"] == f);
+	assert (aStr["d"] == d);
+	assert (aStr["s"] == s);
+	assert (aStr["c"] == c);
+}
+
+
+void DynamicAnyTest::testDate()
+{
+	Poco::DateTime dtNow(2007, 3, 13, 8, 12, 15);
+	
+	Poco::Timestamp tsNow = dtNow.timestamp();
+	Poco::LocalDateTime ldtNow(dtNow.timestamp());
+	DynamicAny dt(dtNow);
+	DynamicAny ts(tsNow);
+	DynamicAny ldt(ldtNow);
+	DynamicAny dtStr(dt.convert<std::string>());
+	DynamicAny tsStr(ts.convert<std::string>());
+	DynamicAny ldtStr(ldt.convert<std::string>());
+	DateTime dtRes = dtStr.convert<DateTime>();
+	LocalDateTime ldtRes = ldtStr.convert<LocalDateTime>();
+	Timestamp tsRes = tsStr.convert<Timestamp>();
+	assert (dtNow == dtRes);
+	assert (ldtNow == ldtRes);
+	assert (tsNow == tsRes);
+}
+
+void DynamicAnyTest::testGetIdxMustThrow(DynamicAny& a1, std::vector<DynamicAny>::size_type n)
+{
+	try
+	{
+		DynamicAny& val1 = a1[n]; 
+		fail("bad cast - must throw");
+		val1 = 0; // silence the compiler
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+
+	try
+	{
+		const DynamicAny& c1 = a1;
+		const DynamicAny& cval1 = c1[n]; 
+		fail("bad const cast - must throw");
+		assert (cval1 == c1); // silence the compiler
+	}
+	catch (Poco::BadCastException&)
+	{
+	}
+}
+
+
+void DynamicAnyTest::setUp()
+{
+}
+
+
+void DynamicAnyTest::tearDown()
+{
+}
+
+
+CppUnit::Test* DynamicAnyTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("DynamicAnyTest");
+
+	CppUnit_addTest(pSuite, DynamicAnyTest, testInt8);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testInt16);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testInt32);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testInt64);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt8);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt16);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt32);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testUInt64);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testBool);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testChar);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testFloat);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testDouble);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testString);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testLong);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testULong);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testConversionOperator);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testComparisonOperators);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testArithmeticOperators);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testLimitsInt);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testLimitsFloat);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testCtor);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testIsStruct);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testIsArray);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testArrayIdxOperator);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testDynamicStructBasics);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testDynamicStruct);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testArrayToString);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testStructToString);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testArrayOfStructsToString);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testStructWithArraysToString);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeString);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializePrimitives);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeArray);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeStruct);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testJSONDeserializeComplex);
+	CppUnit_addTest(pSuite, DynamicAnyTest, testDate);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/DynamicAnyTest.h b/Foundation/testsuite/src/DynamicAnyTest.h
index 3c7283bfb..e9841777d 100644
--- a/Foundation/testsuite/src/DynamicAnyTest.h
+++ b/Foundation/testsuite/src/DynamicAnyTest.h
@@ -1,162 +1,162 @@
-//
-// DynamicAnyTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/DynamicAnyTest.h#2 $
-//
-// Tests for Any types
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-#ifndef DynamicAnyTest_INCLUDED
-#define DynamicAnyTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/Exception.h"
-#include "CppUnit/TestCase.h"
-
-
-class DynamicAnyTest: public CppUnit::TestCase
-{
-public:
-	DynamicAnyTest(const std::string& name);
-	~DynamicAnyTest();
-
-	void testInt8();
-	void testInt16();
-	void testInt32();
-	void testInt64();
-	void testUInt8();
-	void testUInt16();
-	void testUInt32();
-	void testUInt64();
-	void testBool();
-	void testChar();
-	void testFloat();
-	void testDouble();
-	void testLong();
-	void testULong();
-	void testString();
-	void testConversionOperator();
-	void testComparisonOperators();
-	void testArithmeticOperators();
-	void testLimitsInt();
-	void testLimitsFloat();
-	void testCtor();
-	void testIsStruct();
-	void testIsArray();
-	void testArrayIdxOperator();
-	void testDynamicStructBasics();
-	void testDynamicStruct();
-	void testArrayToString();
-	void testStructToString();
-	void testArrayOfStructsToString();
-	void testStructWithArraysToString();
-	void testJSONDeserializeString();
-	void testJSONDeserializePrimitives();
-	void testJSONDeserializeArray();
-	void testJSONDeserializeStruct();
-	void testJSONDeserializeComplex();
-	void testDate();
-
-	void setUp();
-	void tearDown();
-	static CppUnit::Test* suite();
-
-private:
-	void testGetIdxMustThrow(Poco::DynamicAny& a1, std::vector<Poco::DynamicAny>::size_type n);
-	template<typename T>
-	void testGetIdx(Poco::DynamicAny& a1, std::vector<Poco::DynamicAny>::size_type n, const T& expectedResult)
-	{
-		Poco::DynamicAny& val1 = a1[n];
-		assert (val1 == expectedResult);
-
-		const Poco::DynamicAny& c1 = a1;
-		assert (a1 == c1); // silence the compiler
-		const Poco::DynamicAny& cval1 = a1[n];
-		assert (cval1 == expectedResult);
-	}
-
-
-	template<typename TL, typename TS>
-	void testLimitsSigned()
-	{
-		TL iMin = std::numeric_limits<TS>::min();
-		Poco::DynamicAny da = iMin - 1;
-		try { TS i; i = da.convert<TS>(); fail("must fail"); }
-		catch (Poco::RangeException&) {}
-
-		TL iMax = std::numeric_limits<TS>::max();
-		da = iMax + 1;
-		try { TS i; i = da.convert<TS>(); fail("must fail"); }
-		catch (Poco::RangeException&) {}
-	}
-
-	template<typename TL, typename TS>
-	void testLimitsFloatToInt()
-	{
-		Poco::DynamicAny da;
-
-		if (std::numeric_limits<TS>::is_signed)
-		{
-			TL iMin = static_cast<TL>(std::numeric_limits<TS>::min());
-			da = iMin * 10;
-			try { TS i; i = da.convert<TS>(); fail("must fail"); }
-			catch (Poco::RangeException&) {}
-		}
-
-		TL iMax = static_cast<TL>(std::numeric_limits<TS>::max());
-		da = iMax * 10;
-		try { TS i; i = da.convert<TS>(); fail("must fail"); }
-		catch (Poco::RangeException&) {}
-	}
-
-	template<typename TS, typename TU>
-	void testLimitsSignedUnsigned()
-	{
-		assert (std::numeric_limits<TS>::is_signed);
-		assert (!std::numeric_limits<TU>::is_signed);
-
-		TS iMin = std::numeric_limits<TS>::min();
-		Poco::DynamicAny da = iMin;
-		try { TU i; i = da.convert<TU>(); fail("must fail"); }
-		catch (Poco::RangeException&) {}
-	}
-
-	template<typename TL, typename TS>
-	void testLimitsUnsigned()
-	{
-		TL iMax = std::numeric_limits<TS>::max();
-		Poco::DynamicAny da = iMax + 1;
-		try { TS i; i = da.convert<TS>(); fail("must fail"); }
-		catch (Poco::RangeException&) {}
-	}
-};
-
-
-#endif // DynamicAnyTest_INCLUDED
+//
+// DynamicAnyTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/DynamicAnyTest.h#2 $
+//
+// Tests for Any types
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+#ifndef DynamicAnyTest_INCLUDED
+#define DynamicAnyTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/DynamicAny.h"
+#include "Poco/Exception.h"
+#include "CppUnit/TestCase.h"
+
+
+class DynamicAnyTest: public CppUnit::TestCase
+{
+public:
+	DynamicAnyTest(const std::string& name);
+	~DynamicAnyTest();
+
+	void testInt8();
+	void testInt16();
+	void testInt32();
+	void testInt64();
+	void testUInt8();
+	void testUInt16();
+	void testUInt32();
+	void testUInt64();
+	void testBool();
+	void testChar();
+	void testFloat();
+	void testDouble();
+	void testLong();
+	void testULong();
+	void testString();
+	void testConversionOperator();
+	void testComparisonOperators();
+	void testArithmeticOperators();
+	void testLimitsInt();
+	void testLimitsFloat();
+	void testCtor();
+	void testIsStruct();
+	void testIsArray();
+	void testArrayIdxOperator();
+	void testDynamicStructBasics();
+	void testDynamicStruct();
+	void testArrayToString();
+	void testStructToString();
+	void testArrayOfStructsToString();
+	void testStructWithArraysToString();
+	void testJSONDeserializeString();
+	void testJSONDeserializePrimitives();
+	void testJSONDeserializeArray();
+	void testJSONDeserializeStruct();
+	void testJSONDeserializeComplex();
+	void testDate();
+
+	void setUp();
+	void tearDown();
+	static CppUnit::Test* suite();
+
+private:
+	void testGetIdxMustThrow(Poco::DynamicAny& a1, std::vector<Poco::DynamicAny>::size_type n);
+	template<typename T>
+	void testGetIdx(Poco::DynamicAny& a1, std::vector<Poco::DynamicAny>::size_type n, const T& expectedResult)
+	{
+		Poco::DynamicAny& val1 = a1[n];
+		assert (val1 == expectedResult);
+
+		const Poco::DynamicAny& c1 = a1;
+		assert (a1 == c1); // silence the compiler
+		const Poco::DynamicAny& cval1 = a1[n];
+		assert (cval1 == expectedResult);
+	}
+
+
+	template<typename TL, typename TS>
+	void testLimitsSigned()
+	{
+		TL iMin = std::numeric_limits<TS>::min();
+		Poco::DynamicAny da = iMin - 1;
+		try { TS i; i = da.convert<TS>(); fail("must fail"); }
+		catch (Poco::RangeException&) {}
+
+		TL iMax = std::numeric_limits<TS>::max();
+		da = iMax + 1;
+		try { TS i; i = da.convert<TS>(); fail("must fail"); }
+		catch (Poco::RangeException&) {}
+	}
+
+	template<typename TL, typename TS>
+	void testLimitsFloatToInt()
+	{
+		Poco::DynamicAny da;
+
+		if (std::numeric_limits<TS>::is_signed)
+		{
+			TL iMin = static_cast<TL>(std::numeric_limits<TS>::min());
+			da = iMin * 10;
+			try { TS i; i = da.convert<TS>(); fail("must fail"); }
+			catch (Poco::RangeException&) {}
+		}
+
+		TL iMax = static_cast<TL>(std::numeric_limits<TS>::max());
+		da = iMax * 10;
+		try { TS i; i = da.convert<TS>(); fail("must fail"); }
+		catch (Poco::RangeException&) {}
+	}
+
+	template<typename TS, typename TU>
+	void testLimitsSignedUnsigned()
+	{
+		assert (std::numeric_limits<TS>::is_signed);
+		assert (!std::numeric_limits<TU>::is_signed);
+
+		TS iMin = std::numeric_limits<TS>::min();
+		Poco::DynamicAny da = iMin;
+		try { TU i; i = da.convert<TU>(); fail("must fail"); }
+		catch (Poco::RangeException&) {}
+	}
+
+	template<typename TL, typename TS>
+	void testLimitsUnsigned()
+	{
+		TL iMax = std::numeric_limits<TS>::max();
+		Poco::DynamicAny da = iMax + 1;
+		try { TS i; i = da.convert<TS>(); fail("must fail"); }
+		catch (Poco::RangeException&) {}
+	}
+};
+
+
+#endif // DynamicAnyTest_INCLUDED
diff --git a/Foundation/testsuite/src/FileStreamTest.cpp b/Foundation/testsuite/src/FileStreamTest.cpp
index d1632d730..0f517855f 100644
--- a/Foundation/testsuite/src/FileStreamTest.cpp
+++ b/Foundation/testsuite/src/FileStreamTest.cpp
@@ -1,333 +1,333 @@
-//
-// FileStreamTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/FileStreamTest.cpp#2 $
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "FileStreamTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/FileStream.h"
-#include "Poco/File.h"
-#include "Poco/TemporaryFile.h"
-#include "Poco/Exception.h"
-
-
-FileStreamTest::FileStreamTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-FileStreamTest::~FileStreamTest()
-{
-}
-
-
-void FileStreamTest::testRead()
-{
-#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_WIN32_UTF8)
-	char tmp[]={'\xc4', '\xd6', '\xdc', '\xe4', '\xf6', '\xfc', '\0'};
-	std::string file(tmp);
-	file.append(".txt");
-#elif defined(POCO_OS_FAMILY_WINDOWS)
-	char tmp[]={'\xc3', '\x84', '\xc3', '\x96', '\xc3', '\x9c', '\xc3', '\xa4', '\xc3', '\xb6', '\xc3', '\xbc', '\0'};
-	std::string file(tmp);
-	file.append(".txt");
-#else
-	std::string file("testfile.txt");
-#endif
-
-	Poco::TemporaryFile::registerForDeletion(file);
-
-	Poco::FileOutputStream fos(file, std::ios::binary);
-	fos << "sometestdata";
-	fos.close();
-
-	Poco::FileInputStream fis(file);
-	assert (fis.good());
-	std::string read;
-	fis >> read;
-	assert (!read.empty());
-}
-
-
-void FileStreamTest::testWrite()
-{
-#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_WIN32_UTF8)
-	char tmp[]={'\xdf', '\xc4', '\xd6', '\xdc', '\xe4', '\xf6', '\xfc', '\0'};
-	std::string file(tmp);
-	file = "dummy_" + file + (".txt");
-#elif defined(POCO_OS_FAMILY_WINDOWS)
-	char tmp[]={'\xc3', '\x9f', '\xc3', '\x84', '\xc3', '\x96', '\xc3', '\x9c', '\xc3', '\xa4', '\xc3', '\xb6', '\xc3', '\xbc', '\0'};
-	std::string file(tmp);
-	file = "dummy_" + file + ".txt";
-#else
-	std::string file("dummy_file.txt");
-#endif
-
-	Poco::TemporaryFile::registerForDeletion(file);
-
-	Poco::FileOutputStream fos(file);
-	assert (fos.good());
-	fos << "hiho";
-	fos.close();
-
-	Poco::FileInputStream fis(file);
-	assert (fis.good());
-	std::string read;
-	fis >> read;
-	assert (read == "hiho");
-}
-
-
-void FileStreamTest::testReadWrite()
-{
-#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_WIN32_UTF8)
-	char tmp[]={'\xdf', '\xc4', '\xd6', '\xdc', '\xe4', '\xf6', '\xfc', '\0'};
-	std::string file(tmp);
-	file = "dummy_" + file + (".txt");
-#else
-	char tmp[]={'\xc3', '\x9f', '\xc3', '\x84', '\xc3', '\x96', '\xc3', '\x9c', '\xc3', '\xa4', '\xc3', '\xb6', '\xc3', '\xbc', '\0'};
-	std::string file(tmp);
-	file = "dummy_" + file + ".txt";
-#endif
-
-	Poco::TemporaryFile::registerForDeletion(file);
-
-	Poco::FileStream fos(file);
-	assert (fos.good());
-	fos << "hiho";
-	fos.seekg(0, std::ios::beg);
-	std::string read;
-	fos >> read;
-	assert (read == "hiho");
-}
-
-
-void FileStreamTest::testOpen()
-{
-	Poco::FileOutputStream ostr;
-	ostr.open("test.txt", std::ios::out);
-	assert (ostr.good());
-	ostr.close();
-}
-
-
-void FileStreamTest::testOpenModeIn()
-{
-	Poco::File f("nonexistent.txt");
-	if (f.exists())
-		f.remove();
-	
-	try
-	{	
-		Poco::FileInputStream istr("nonexistent.txt");
-		fail("nonexistent file - must throw");
-	}
-	catch (Poco::Exception&)
-	{
-	}
-
-	f.createFile();
-	Poco::FileInputStream istr("nonexistent.txt");
-	assert (istr.good());
-}
-
-
-void FileStreamTest::testOpenModeOut()
-{
-	Poco::File f("test.txt");
-	if (f.exists())
-		f.remove();
-	
-	Poco::FileOutputStream ostr1("test.txt");
-	ostr1 << "Hello, world!";
-	ostr1.close();
-
-	assert (f.exists());
-	assert (f.getSize() != 0);
-	
-	Poco::FileStream str1("test.txt");
-	str1.close();
-
-	assert (f.exists());
-	assert (f.getSize() != 0);
-		
-	Poco::FileOutputStream ostr2("test.txt");
-	ostr2.close();
-
-	assert (f.exists());
-	assert (f.getSize() == 0);
-
-	f.remove();
-}
-
-
-void FileStreamTest::testOpenModeTrunc()
-{
-	Poco::File f("test.txt");
-	if (f.exists())
-		f.remove();
-	
-	Poco::FileOutputStream ostr1("test.txt");
-	ostr1 << "Hello, world!";
-	ostr1.close();
-
-	assert (f.exists());
-	assert (f.getSize() != 0);
-	
-	Poco::FileStream str1("test.txt", std::ios::trunc);
-	str1.close();
-
-	assert (f.exists());
-	assert (f.getSize() == 0);
-
-	f.remove();
-}
-
-
-void FileStreamTest::testOpenModeAte()
-{
-	Poco::FileOutputStream ostr("test.txt");
-	ostr << "0123456789";
-	ostr.close();
-	
-	Poco::FileStream str1("test.txt", std::ios::ate);
-	int c = str1.get();
-	assert (str1.eof());
-	
-	str1.clear();
-	str1.seekg(0);
-	c = str1.get();
-	assert (c == '0');
-	
-	str1.close();
-
-	Poco::FileStream str2("test.txt", std::ios::ate);
-	str2 << "abcdef";
-	str2.seekg(0);
-	std::string s;
-	str2 >> s;
-	assert (s == "0123456789abcdef");
-	str2.close();
-}
-
-
-void FileStreamTest::testOpenModeApp()
-{
-	Poco::FileOutputStream ostr("test.txt");
-	ostr << "0123456789";
-	ostr.close();
-	
-	Poco::FileStream str1("test.txt", std::ios::app);
-
-	str1 << "abc";
-	
-	str1.seekp(0);
-	
-	str1 << "def";
-	
-	str1.close();
-
-	Poco::FileInputStream istr("test.txt");
-	std::string s;
-	istr >> s;
-	assert (s == "0123456789abcdef");
-	istr.close();
-}
-
-
-void FileStreamTest::testSeek()
-{
-	Poco::FileStream str("test.txt", std::ios::trunc);
-	str << "0123456789abcdef";
-	
-	str.seekg(0);
-	int c = str.get();
-	assert (c == '0');
-	
-	str.seekg(10);
-	assert (str.tellg() == std::streampos(10));
-	c = str.get();
-	assert (c == 'a');
-	assert (str.tellg() == std::streampos(11));
-	
-	str.seekg(-1, std::ios::end);
-	assert (str.tellg() == std::streampos(15));
-	c = str.get();
-	assert (c == 'f');
-	assert (str.tellg() == std::streampos(16));
-	
-	str.seekg(-1, std::ios::cur);
-	assert (str.tellg() == std::streampos(15));
-	c = str.get();
-	assert (c == 'f');
-	assert (str.tellg() == std::streampos(16));
-	
-	str.seekg(-4, std::ios::cur);
-	assert (str.tellg() == std::streampos(12));
-	c = str.get();
-	assert (c == 'c');
-	assert (str.tellg() == std::streampos(13));
-	
-	str.seekg(1, std::ios::cur);
-	assert (str.tellg() == std::streampos(14));
-	c = str.get();
-	assert (c == 'e');
-	assert (str.tellg() == std::streampos(15));
-}
-
-
-void FileStreamTest::setUp()
-{
-}
-
-
-void FileStreamTest::tearDown()
-{
-}
-
-
-CppUnit::Test* FileStreamTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FileStreamTest");
-
-	CppUnit_addTest(pSuite, FileStreamTest, testRead);
-	CppUnit_addTest(pSuite, FileStreamTest, testWrite);
-	CppUnit_addTest(pSuite, FileStreamTest, testReadWrite);
-	CppUnit_addTest(pSuite, FileStreamTest, testOpen);
-	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeIn);
-	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeOut);
-	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeTrunc);
-	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeAte);
-	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeApp);
-	CppUnit_addTest(pSuite, FileStreamTest, testSeek);
-
-	return pSuite;
-}
+//
+// FileStreamTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/FileStreamTest.cpp#2 $
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "FileStreamTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/FileStream.h"
+#include "Poco/File.h"
+#include "Poco/TemporaryFile.h"
+#include "Poco/Exception.h"
+
+
+FileStreamTest::FileStreamTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+FileStreamTest::~FileStreamTest()
+{
+}
+
+
+void FileStreamTest::testRead()
+{
+#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_WIN32_UTF8)
+	char tmp[]={'\xc4', '\xd6', '\xdc', '\xe4', '\xf6', '\xfc', '\0'};
+	std::string file(tmp);
+	file.append(".txt");
+#elif defined(POCO_OS_FAMILY_WINDOWS)
+	char tmp[]={'\xc3', '\x84', '\xc3', '\x96', '\xc3', '\x9c', '\xc3', '\xa4', '\xc3', '\xb6', '\xc3', '\xbc', '\0'};
+	std::string file(tmp);
+	file.append(".txt");
+#else
+	std::string file("testfile.txt");
+#endif
+
+	Poco::TemporaryFile::registerForDeletion(file);
+
+	Poco::FileOutputStream fos(file, std::ios::binary);
+	fos << "sometestdata";
+	fos.close();
+
+	Poco::FileInputStream fis(file);
+	assert (fis.good());
+	std::string read;
+	fis >> read;
+	assert (!read.empty());
+}
+
+
+void FileStreamTest::testWrite()
+{
+#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_WIN32_UTF8)
+	char tmp[]={'\xdf', '\xc4', '\xd6', '\xdc', '\xe4', '\xf6', '\xfc', '\0'};
+	std::string file(tmp);
+	file = "dummy_" + file + (".txt");
+#elif defined(POCO_OS_FAMILY_WINDOWS)
+	char tmp[]={'\xc3', '\x9f', '\xc3', '\x84', '\xc3', '\x96', '\xc3', '\x9c', '\xc3', '\xa4', '\xc3', '\xb6', '\xc3', '\xbc', '\0'};
+	std::string file(tmp);
+	file = "dummy_" + file + ".txt";
+#else
+	std::string file("dummy_file.txt");
+#endif
+
+	Poco::TemporaryFile::registerForDeletion(file);
+
+	Poco::FileOutputStream fos(file);
+	assert (fos.good());
+	fos << "hiho";
+	fos.close();
+
+	Poco::FileInputStream fis(file);
+	assert (fis.good());
+	std::string read;
+	fis >> read;
+	assert (read == "hiho");
+}
+
+
+void FileStreamTest::testReadWrite()
+{
+#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_WIN32_UTF8)
+	char tmp[]={'\xdf', '\xc4', '\xd6', '\xdc', '\xe4', '\xf6', '\xfc', '\0'};
+	std::string file(tmp);
+	file = "dummy_" + file + (".txt");
+#else
+	char tmp[]={'\xc3', '\x9f', '\xc3', '\x84', '\xc3', '\x96', '\xc3', '\x9c', '\xc3', '\xa4', '\xc3', '\xb6', '\xc3', '\xbc', '\0'};
+	std::string file(tmp);
+	file = "dummy_" + file + ".txt";
+#endif
+
+	Poco::TemporaryFile::registerForDeletion(file);
+
+	Poco::FileStream fos(file);
+	assert (fos.good());
+	fos << "hiho";
+	fos.seekg(0, std::ios::beg);
+	std::string read;
+	fos >> read;
+	assert (read == "hiho");
+}
+
+
+void FileStreamTest::testOpen()
+{
+	Poco::FileOutputStream ostr;
+	ostr.open("test.txt", std::ios::out);
+	assert (ostr.good());
+	ostr.close();
+}
+
+
+void FileStreamTest::testOpenModeIn()
+{
+	Poco::File f("nonexistent.txt");
+	if (f.exists())
+		f.remove();
+	
+	try
+	{	
+		Poco::FileInputStream istr("nonexistent.txt");
+		fail("nonexistent file - must throw");
+	}
+	catch (Poco::Exception&)
+	{
+	}
+
+	f.createFile();
+	Poco::FileInputStream istr("nonexistent.txt");
+	assert (istr.good());
+}
+
+
+void FileStreamTest::testOpenModeOut()
+{
+	Poco::File f("test.txt");
+	if (f.exists())
+		f.remove();
+	
+	Poco::FileOutputStream ostr1("test.txt");
+	ostr1 << "Hello, world!";
+	ostr1.close();
+
+	assert (f.exists());
+	assert (f.getSize() != 0);
+	
+	Poco::FileStream str1("test.txt");
+	str1.close();
+
+	assert (f.exists());
+	assert (f.getSize() != 0);
+		
+	Poco::FileOutputStream ostr2("test.txt");
+	ostr2.close();
+
+	assert (f.exists());
+	assert (f.getSize() == 0);
+
+	f.remove();
+}
+
+
+void FileStreamTest::testOpenModeTrunc()
+{
+	Poco::File f("test.txt");
+	if (f.exists())
+		f.remove();
+	
+	Poco::FileOutputStream ostr1("test.txt");
+	ostr1 << "Hello, world!";
+	ostr1.close();
+
+	assert (f.exists());
+	assert (f.getSize() != 0);
+	
+	Poco::FileStream str1("test.txt", std::ios::trunc);
+	str1.close();
+
+	assert (f.exists());
+	assert (f.getSize() == 0);
+
+	f.remove();
+}
+
+
+void FileStreamTest::testOpenModeAte()
+{
+	Poco::FileOutputStream ostr("test.txt");
+	ostr << "0123456789";
+	ostr.close();
+	
+	Poco::FileStream str1("test.txt", std::ios::ate);
+	int c = str1.get();
+	assert (str1.eof());
+	
+	str1.clear();
+	str1.seekg(0);
+	c = str1.get();
+	assert (c == '0');
+	
+	str1.close();
+
+	Poco::FileStream str2("test.txt", std::ios::ate);
+	str2 << "abcdef";
+	str2.seekg(0);
+	std::string s;
+	str2 >> s;
+	assert (s == "0123456789abcdef");
+	str2.close();
+}
+
+
+void FileStreamTest::testOpenModeApp()
+{
+	Poco::FileOutputStream ostr("test.txt");
+	ostr << "0123456789";
+	ostr.close();
+	
+	Poco::FileStream str1("test.txt", std::ios::app);
+
+	str1 << "abc";
+	
+	str1.seekp(0);
+	
+	str1 << "def";
+	
+	str1.close();
+
+	Poco::FileInputStream istr("test.txt");
+	std::string s;
+	istr >> s;
+	assert (s == "0123456789abcdef");
+	istr.close();
+}
+
+
+void FileStreamTest::testSeek()
+{
+	Poco::FileStream str("test.txt", std::ios::trunc);
+	str << "0123456789abcdef";
+	
+	str.seekg(0);
+	int c = str.get();
+	assert (c == '0');
+	
+	str.seekg(10);
+	assert (str.tellg() == std::streampos(10));
+	c = str.get();
+	assert (c == 'a');
+	assert (str.tellg() == std::streampos(11));
+	
+	str.seekg(-1, std::ios::end);
+	assert (str.tellg() == std::streampos(15));
+	c = str.get();
+	assert (c == 'f');
+	assert (str.tellg() == std::streampos(16));
+	
+	str.seekg(-1, std::ios::cur);
+	assert (str.tellg() == std::streampos(15));
+	c = str.get();
+	assert (c == 'f');
+	assert (str.tellg() == std::streampos(16));
+	
+	str.seekg(-4, std::ios::cur);
+	assert (str.tellg() == std::streampos(12));
+	c = str.get();
+	assert (c == 'c');
+	assert (str.tellg() == std::streampos(13));
+	
+	str.seekg(1, std::ios::cur);
+	assert (str.tellg() == std::streampos(14));
+	c = str.get();
+	assert (c == 'e');
+	assert (str.tellg() == std::streampos(15));
+}
+
+
+void FileStreamTest::setUp()
+{
+}
+
+
+void FileStreamTest::tearDown()
+{
+}
+
+
+CppUnit::Test* FileStreamTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("FileStreamTest");
+
+	CppUnit_addTest(pSuite, FileStreamTest, testRead);
+	CppUnit_addTest(pSuite, FileStreamTest, testWrite);
+	CppUnit_addTest(pSuite, FileStreamTest, testReadWrite);
+	CppUnit_addTest(pSuite, FileStreamTest, testOpen);
+	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeIn);
+	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeOut);
+	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeTrunc);
+	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeAte);
+	CppUnit_addTest(pSuite, FileStreamTest, testOpenModeApp);
+	CppUnit_addTest(pSuite, FileStreamTest, testSeek);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/FileStreamTest.h b/Foundation/testsuite/src/FileStreamTest.h
index cf6daa857..31b954e4f 100644
--- a/Foundation/testsuite/src/FileStreamTest.h
+++ b/Foundation/testsuite/src/FileStreamTest.h
@@ -1,69 +1,69 @@
-//
-// FileStreamTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/FileStreamTest.h#2 $
-//
-// Definition of the FileStreamTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef FileStreamTest_INCLUDED
-#define FileStreamTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class FileStreamTest: public CppUnit::TestCase
-{
-public:
-	FileStreamTest(const std::string& name);
-	~FileStreamTest();
-
-	void testRead();
-	void testWrite();
-	void testReadWrite();
-	void testOpen();
-	void testOpenModeIn();
-	void testOpenModeOut();
-	void testOpenModeTrunc();
-	void testOpenModeAte();
-	void testOpenModeApp();
-	void testSeek();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // FileStreamTest_INCLUDED
+//
+// FileStreamTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/FileStreamTest.h#2 $
+//
+// Definition of the FileStreamTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef FileStreamTest_INCLUDED
+#define FileStreamTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class FileStreamTest: public CppUnit::TestCase
+{
+public:
+	FileStreamTest(const std::string& name);
+	~FileStreamTest();
+
+	void testRead();
+	void testWrite();
+	void testReadWrite();
+	void testOpen();
+	void testOpenModeIn();
+	void testOpenModeOut();
+	void testOpenModeTrunc();
+	void testOpenModeAte();
+	void testOpenModeApp();
+	void testSeek();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // FileStreamTest_INCLUDED
diff --git a/Foundation/testsuite/src/HashMapTest.cpp b/Foundation/testsuite/src/HashMapTest.cpp
index a4d0e42ad..a0ee97e7d 100644
--- a/Foundation/testsuite/src/HashMapTest.cpp
+++ b/Foundation/testsuite/src/HashMapTest.cpp
@@ -1,242 +1,242 @@
-//
-// HashMapTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashMapTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "HashMapTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/HashMap.h"
-#include "Poco/Exception.h"
-#include <map>
-
-
-using Poco::HashMap;
-
-
-HashMapTest::HashMapTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-HashMapTest::~HashMapTest()
-{
-}
-
-
-void HashMapTest::testInsert()
-{
-	const int N = 1000;
-
-	typedef HashMap<int, int> IntMap;
-	IntMap hm;
-	
-	assert (hm.empty());
-	
-	for (int i = 0; i < N; ++i)
-	{
-		std::pair<IntMap::Iterator, bool> res = hm.insert(IntMap::ValueType(i, i*2));
-		assert (res.first->first == i);
-		assert (res.first->second == i*2);
-		assert (res.second);
-		IntMap::Iterator it = hm.find(i);
-		assert (it != hm.end());
-		assert (it->first == i);
-		assert (it->second == i*2);
-		assert (hm.size() == i + 1);
-	}		
-	
-	assert (!hm.empty());
-	
-	for (int i = 0; i < N; ++i)
-	{
-		IntMap::Iterator it = hm.find(i);
-		assert (it != hm.end());
-		assert (it->first == i);
-		assert (it->second == i*2);
-	}
-	
-	for (int i = 0; i < N; ++i)
-	{
-		std::pair<IntMap::Iterator, bool> res = hm.insert(IntMap::ValueType(i, 0));
-		assert (res.first->first == i);
-		assert (res.first->second == i*2);
-		assert (!res.second);
-	}		
-}
-
-
-void HashMapTest::testErase()
-{
-	const int N = 1000;
-
-	typedef HashMap<int, int> IntMap;
-	IntMap hm;
-
-	for (int i = 0; i < N; ++i)
-	{
-		hm.insert(IntMap::ValueType(i, i*2));
-	}
-	assert (hm.size() == N);
-	
-	for (int i = 0; i < N; i += 2)
-	{
-		hm.erase(i);
-		IntMap::Iterator it = hm.find(i);
-		assert (it == hm.end());
-	}
-	assert (hm.size() == N/2);
-	
-	for (int i = 0; i < N; i += 2)
-	{
-		IntMap::Iterator it = hm.find(i);
-		assert (it == hm.end());
-	}
-	
-	for (int i = 1; i < N; i += 2)
-	{
-		IntMap::Iterator it = hm.find(i);
-		assert (it != hm.end());
-		assert (*it == i);
-	}
-
-	for (int i = 0; i < N; i += 2)
-	{
-		hm.insert(IntMap::ValueType(i, i*2));
-	}
-	
-	for (int i = 0; i < N; ++i)
-	{
-		IntMap::Iterator it = hm.find(i);
-		assert (it != hm.end());
-		assert (it->first == i);
-		assert (it->second == i*2);		
-	}
-}
-
-
-void HashMapTest::testIterator()
-{
-	const int N = 1000;
-
-	typedef HashMap<int, int> IntMap;
-	IntMap hm;
-
-	for (int i = 0; i < N; ++i)
-	{
-		hm.insert(IntMap::ValueType(i, i*2));
-	}
-	
-	std::map<int, int> values;
-	IntMap::Iterator it = hm.begin();
-	while (it != hm.end())
-	{
-		assert (values.find(it->first) == values.end());
-		values[it->first] = it->second;
-		++it;
-	}
-	
-	assert (values.size() == N);
-}
-
-
-void HashMapTest::testConstIterator()
-{
-	const int N = 1000;
-
-	typedef HashMap<int, int> IntMap;
-	IntMap hm;
-
-	for (int i = 0; i < N; ++i)
-	{
-		hm.insert(IntMap::ValueType(i, i*2));
-	}
-	
-	std::map<int, int> values;
-	IntMap::ConstIterator it = hm.begin();
-	while (it != hm.end())
-	{
-		assert (values.find(it->first) == values.end());
-		values[it->first] = it->second;
-		++it;
-	}
-	
-	assert (values.size() == N);
-}
-
-
-void HashMapTest::testIndex()
-{
-	typedef HashMap<int, int> IntMap;
-	IntMap hm;
-
-	hm[1] = 2;
-	hm[2] = 4;
-	hm[3] = 6;
-	
-	assert (hm.size() == 3);
-	assert (hm[1] == 2);
-	assert (hm[2] == 4);
-	assert (hm[3] == 6);
-	
-	try
-	{
-		const IntMap& im = hm;
-		int x = im[4];
-		fail("no such key - must throw");
-	}
-	catch (Poco::NotFoundException&)
-	{
-	}
-}
-
-
-void HashMapTest::setUp()
-{
-}
-
-
-void HashMapTest::tearDown()
-{
-}
-
-
-CppUnit::Test* HashMapTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashMapTest");
-
-	CppUnit_addTest(pSuite, HashMapTest, testInsert);
-	CppUnit_addTest(pSuite, HashMapTest, testErase);
-	CppUnit_addTest(pSuite, HashMapTest, testIterator);
-	CppUnit_addTest(pSuite, HashMapTest, testConstIterator);
-	CppUnit_addTest(pSuite, HashMapTest, testIndex);
-
-	return pSuite;
-}
+//
+// HashMapTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashMapTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "HashMapTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/HashMap.h"
+#include "Poco/Exception.h"
+#include <map>
+
+
+using Poco::HashMap;
+
+
+HashMapTest::HashMapTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+HashMapTest::~HashMapTest()
+{
+}
+
+
+void HashMapTest::testInsert()
+{
+	const int N = 1000;
+
+	typedef HashMap<int, int> IntMap;
+	IntMap hm;
+	
+	assert (hm.empty());
+	
+	for (int i = 0; i < N; ++i)
+	{
+		std::pair<IntMap::Iterator, bool> res = hm.insert(IntMap::ValueType(i, i*2));
+		assert (res.first->first == i);
+		assert (res.first->second == i*2);
+		assert (res.second);
+		IntMap::Iterator it = hm.find(i);
+		assert (it != hm.end());
+		assert (it->first == i);
+		assert (it->second == i*2);
+		assert (hm.size() == i + 1);
+	}		
+	
+	assert (!hm.empty());
+	
+	for (int i = 0; i < N; ++i)
+	{
+		IntMap::Iterator it = hm.find(i);
+		assert (it != hm.end());
+		assert (it->first == i);
+		assert (it->second == i*2);
+	}
+	
+	for (int i = 0; i < N; ++i)
+	{
+		std::pair<IntMap::Iterator, bool> res = hm.insert(IntMap::ValueType(i, 0));
+		assert (res.first->first == i);
+		assert (res.first->second == i*2);
+		assert (!res.second);
+	}		
+}
+
+
+void HashMapTest::testErase()
+{
+	const int N = 1000;
+
+	typedef HashMap<int, int> IntMap;
+	IntMap hm;
+
+	for (int i = 0; i < N; ++i)
+	{
+		hm.insert(IntMap::ValueType(i, i*2));
+	}
+	assert (hm.size() == N);
+	
+	for (int i = 0; i < N; i += 2)
+	{
+		hm.erase(i);
+		IntMap::Iterator it = hm.find(i);
+		assert (it == hm.end());
+	}
+	assert (hm.size() == N/2);
+	
+	for (int i = 0; i < N; i += 2)
+	{
+		IntMap::Iterator it = hm.find(i);
+		assert (it == hm.end());
+	}
+	
+	for (int i = 1; i < N; i += 2)
+	{
+		IntMap::Iterator it = hm.find(i);
+		assert (it != hm.end());
+		assert (*it == i);
+	}
+
+	for (int i = 0; i < N; i += 2)
+	{
+		hm.insert(IntMap::ValueType(i, i*2));
+	}
+	
+	for (int i = 0; i < N; ++i)
+	{
+		IntMap::Iterator it = hm.find(i);
+		assert (it != hm.end());
+		assert (it->first == i);
+		assert (it->second == i*2);		
+	}
+}
+
+
+void HashMapTest::testIterator()
+{
+	const int N = 1000;
+
+	typedef HashMap<int, int> IntMap;
+	IntMap hm;
+
+	for (int i = 0; i < N; ++i)
+	{
+		hm.insert(IntMap::ValueType(i, i*2));
+	}
+	
+	std::map<int, int> values;
+	IntMap::Iterator it = hm.begin();
+	while (it != hm.end())
+	{
+		assert (values.find(it->first) == values.end());
+		values[it->first] = it->second;
+		++it;
+	}
+	
+	assert (values.size() == N);
+}
+
+
+void HashMapTest::testConstIterator()
+{
+	const int N = 1000;
+
+	typedef HashMap<int, int> IntMap;
+	IntMap hm;
+
+	for (int i = 0; i < N; ++i)
+	{
+		hm.insert(IntMap::ValueType(i, i*2));
+	}
+	
+	std::map<int, int> values;
+	IntMap::ConstIterator it = hm.begin();
+	while (it != hm.end())
+	{
+		assert (values.find(it->first) == values.end());
+		values[it->first] = it->second;
+		++it;
+	}
+	
+	assert (values.size() == N);
+}
+
+
+void HashMapTest::testIndex()
+{
+	typedef HashMap<int, int> IntMap;
+	IntMap hm;
+
+	hm[1] = 2;
+	hm[2] = 4;
+	hm[3] = 6;
+	
+	assert (hm.size() == 3);
+	assert (hm[1] == 2);
+	assert (hm[2] == 4);
+	assert (hm[3] == 6);
+	
+	try
+	{
+		const IntMap& im = hm;
+		int x = im[4];
+		fail("no such key - must throw");
+	}
+	catch (Poco::NotFoundException&)
+	{
+	}
+}
+
+
+void HashMapTest::setUp()
+{
+}
+
+
+void HashMapTest::tearDown()
+{
+}
+
+
+CppUnit::Test* HashMapTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashMapTest");
+
+	CppUnit_addTest(pSuite, HashMapTest, testInsert);
+	CppUnit_addTest(pSuite, HashMapTest, testErase);
+	CppUnit_addTest(pSuite, HashMapTest, testIterator);
+	CppUnit_addTest(pSuite, HashMapTest, testConstIterator);
+	CppUnit_addTest(pSuite, HashMapTest, testIndex);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/HashMapTest.h b/Foundation/testsuite/src/HashMapTest.h
index 4184d3a9a..f09e8fb78 100644
--- a/Foundation/testsuite/src/HashMapTest.h
+++ b/Foundation/testsuite/src/HashMapTest.h
@@ -1,64 +1,64 @@
-//
-// HashMapTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashMapTest.h#2 $
-//
-// Definition of the HashMapTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef HashMapTest_INCLUDED
-#define HashMapTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class HashMapTest: public CppUnit::TestCase
-{
-public:
-	HashMapTest(const std::string& name);
-	~HashMapTest();
-
-	void testInsert();
-	void testErase();
-	void testIterator();
-	void testConstIterator();
-	void testIndex();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // HashMapTest_INCLUDED
+//
+// HashMapTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashMapTest.h#2 $
+//
+// Definition of the HashMapTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef HashMapTest_INCLUDED
+#define HashMapTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class HashMapTest: public CppUnit::TestCase
+{
+public:
+	HashMapTest(const std::string& name);
+	~HashMapTest();
+
+	void testInsert();
+	void testErase();
+	void testIterator();
+	void testConstIterator();
+	void testIndex();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // HashMapTest_INCLUDED
diff --git a/Foundation/testsuite/src/HashSetTest.cpp b/Foundation/testsuite/src/HashSetTest.cpp
index a61f56433..0b3751388 100644
--- a/Foundation/testsuite/src/HashSetTest.cpp
+++ b/Foundation/testsuite/src/HashSetTest.cpp
@@ -1,205 +1,205 @@
-//
-// HashSetTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashSetTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "HashSetTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/HashSet.h"
-#include <set>
-
-
-using Poco::HashSet;
-
-
-HashSetTest::HashSetTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-HashSetTest::~HashSetTest()
-{
-}
-
-
-void HashSetTest::testInsert()
-{
-	const int N = 1000;
-
-	HashSet<int> hs;
-	
-	assert (hs.empty());
-	
-	for (int i = 0; i < N; ++i)
-	{
-		std::pair<HashSet<int>::Iterator, bool> res = hs.insert(i);
-		assert (*res.first == i);
-		assert (res.second);
-		HashSet<int>::Iterator it = hs.find(i);
-		assert (it != hs.end());
-		assert (*it == i);
-		assert (hs.size() == i + 1);
-	}		
-	
-	assert (!hs.empty());
-	
-	for (int i = 0; i < N; ++i)
-	{
-		HashSet<int>::Iterator it = hs.find(i);
-		assert (it != hs.end());
-		assert (*it == i);
-	}
-	
-	for (int i = 0; i < N; ++i)
-	{
-		std::pair<HashSet<int>::Iterator, bool> res = hs.insert(i);
-		assert (*res.first == i);
-		assert (!res.second);
-	}		
-}
-
-
-void HashSetTest::testErase()
-{
-	const int N = 1000;
-
-	HashSet<int> hs;
-
-	for (int i = 0; i < N; ++i)
-	{
-		hs.insert(i);
-	}
-	assert (hs.size() == N);
-	
-	for (int i = 0; i < N; i += 2)
-	{
-		hs.erase(i);
-		HashSet<int>::Iterator it = hs.find(i);
-		assert (it == hs.end());
-	}
-	assert (hs.size() == N/2);
-	
-	for (int i = 0; i < N; i += 2)
-	{
-		HashSet<int>::Iterator it = hs.find(i);
-		assert (it == hs.end());
-	}
-	
-	for (int i = 1; i < N; i += 2)
-	{
-		HashSet<int>::Iterator it = hs.find(i);
-		assert (it != hs.end());
-		assert (*it == i);
-	}
-
-	for (int i = 0; i < N; i += 2)
-	{
-		hs.insert(i);
-	}
-	
-	for (int i = 0; i < N; ++i)
-	{
-		HashSet<int>::Iterator it = hs.find(i);
-		assert (it != hs.end());
-		assert (*it == i);
-	}
-}
-
-
-void HashSetTest::testIterator()
-{
-	const int N = 1000;
-
-	HashSet<int> hs;
-
-	for (int i = 0; i < N; ++i)
-	{
-		hs.insert(i);
-	}
-	
-	std::set<int> values;
-	HashSet<int>::Iterator it = hs.begin();
-	while (it != hs.end())
-	{
-		assert (values.find(*it) == values.end());
-		values.insert(*it);
-		++it;
-	}
-	
-	assert (values.size() == N);
-}
-
-
-void HashSetTest::testConstIterator()
-{
-	const int N = 1000;
-
-	HashSet<int> hs;
-
-	for (int i = 0; i < N; ++i)
-	{
-		hs.insert(i);
-	}
-	
-	std::set<int> values;
-	HashSet<int>::ConstIterator it = hs.begin();
-	while (it != hs.end())
-	{
-		assert (values.find(*it) == values.end());
-		values.insert(*it);
-		++it;
-	}
-	
-	assert (values.size() == N);
-}
-
-
-void HashSetTest::setUp()
-{
-}
-
-
-void HashSetTest::tearDown()
-{
-}
-
-
-CppUnit::Test* HashSetTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashSetTest");
-
-	CppUnit_addTest(pSuite, HashSetTest, testInsert);
-	CppUnit_addTest(pSuite, HashSetTest, testErase);
-	CppUnit_addTest(pSuite, HashSetTest, testIterator);
-	CppUnit_addTest(pSuite, HashSetTest, testConstIterator);
-
-	return pSuite;
-}
+//
+// HashSetTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashSetTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "HashSetTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/HashSet.h"
+#include <set>
+
+
+using Poco::HashSet;
+
+
+HashSetTest::HashSetTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+HashSetTest::~HashSetTest()
+{
+}
+
+
+void HashSetTest::testInsert()
+{
+	const int N = 1000;
+
+	HashSet<int> hs;
+	
+	assert (hs.empty());
+	
+	for (int i = 0; i < N; ++i)
+	{
+		std::pair<HashSet<int>::Iterator, bool> res = hs.insert(i);
+		assert (*res.first == i);
+		assert (res.second);
+		HashSet<int>::Iterator it = hs.find(i);
+		assert (it != hs.end());
+		assert (*it == i);
+		assert (hs.size() == i + 1);
+	}		
+	
+	assert (!hs.empty());
+	
+	for (int i = 0; i < N; ++i)
+	{
+		HashSet<int>::Iterator it = hs.find(i);
+		assert (it != hs.end());
+		assert (*it == i);
+	}
+	
+	for (int i = 0; i < N; ++i)
+	{
+		std::pair<HashSet<int>::Iterator, bool> res = hs.insert(i);
+		assert (*res.first == i);
+		assert (!res.second);
+	}		
+}
+
+
+void HashSetTest::testErase()
+{
+	const int N = 1000;
+
+	HashSet<int> hs;
+
+	for (int i = 0; i < N; ++i)
+	{
+		hs.insert(i);
+	}
+	assert (hs.size() == N);
+	
+	for (int i = 0; i < N; i += 2)
+	{
+		hs.erase(i);
+		HashSet<int>::Iterator it = hs.find(i);
+		assert (it == hs.end());
+	}
+	assert (hs.size() == N/2);
+	
+	for (int i = 0; i < N; i += 2)
+	{
+		HashSet<int>::Iterator it = hs.find(i);
+		assert (it == hs.end());
+	}
+	
+	for (int i = 1; i < N; i += 2)
+	{
+		HashSet<int>::Iterator it = hs.find(i);
+		assert (it != hs.end());
+		assert (*it == i);
+	}
+
+	for (int i = 0; i < N; i += 2)
+	{
+		hs.insert(i);
+	}
+	
+	for (int i = 0; i < N; ++i)
+	{
+		HashSet<int>::Iterator it = hs.find(i);
+		assert (it != hs.end());
+		assert (*it == i);
+	}
+}
+
+
+void HashSetTest::testIterator()
+{
+	const int N = 1000;
+
+	HashSet<int> hs;
+
+	for (int i = 0; i < N; ++i)
+	{
+		hs.insert(i);
+	}
+	
+	std::set<int> values;
+	HashSet<int>::Iterator it = hs.begin();
+	while (it != hs.end())
+	{
+		assert (values.find(*it) == values.end());
+		values.insert(*it);
+		++it;
+	}
+	
+	assert (values.size() == N);
+}
+
+
+void HashSetTest::testConstIterator()
+{
+	const int N = 1000;
+
+	HashSet<int> hs;
+
+	for (int i = 0; i < N; ++i)
+	{
+		hs.insert(i);
+	}
+	
+	std::set<int> values;
+	HashSet<int>::ConstIterator it = hs.begin();
+	while (it != hs.end())
+	{
+		assert (values.find(*it) == values.end());
+		values.insert(*it);
+		++it;
+	}
+	
+	assert (values.size() == N);
+}
+
+
+void HashSetTest::setUp()
+{
+}
+
+
+void HashSetTest::tearDown()
+{
+}
+
+
+CppUnit::Test* HashSetTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashSetTest");
+
+	CppUnit_addTest(pSuite, HashSetTest, testInsert);
+	CppUnit_addTest(pSuite, HashSetTest, testErase);
+	CppUnit_addTest(pSuite, HashSetTest, testIterator);
+	CppUnit_addTest(pSuite, HashSetTest, testConstIterator);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/HashSetTest.h b/Foundation/testsuite/src/HashSetTest.h
index 52c945ee7..7456bf6e4 100644
--- a/Foundation/testsuite/src/HashSetTest.h
+++ b/Foundation/testsuite/src/HashSetTest.h
@@ -1,63 +1,63 @@
-//
-// HashSetTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashSetTest.h#2 $
-//
-// Definition of the HashSetTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef HashSetTest_INCLUDED
-#define HashSetTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class HashSetTest: public CppUnit::TestCase
-{
-public:
-	HashSetTest(const std::string& name);
-	~HashSetTest();
-
-	void testInsert();
-	void testErase();
-	void testIterator();
-	void testConstIterator();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // HashSetTest_INCLUDED
+//
+// HashSetTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashSetTest.h#2 $
+//
+// Definition of the HashSetTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef HashSetTest_INCLUDED
+#define HashSetTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class HashSetTest: public CppUnit::TestCase
+{
+public:
+	HashSetTest(const std::string& name);
+	~HashSetTest();
+
+	void testInsert();
+	void testErase();
+	void testIterator();
+	void testConstIterator();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // HashSetTest_INCLUDED
diff --git a/Foundation/testsuite/src/HashTableTest.cpp b/Foundation/testsuite/src/HashTableTest.cpp
index a276caffe..d378db3ad 100644
--- a/Foundation/testsuite/src/HashTableTest.cpp
+++ b/Foundation/testsuite/src/HashTableTest.cpp
@@ -1,224 +1,224 @@
-//
-// HashTableTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashTableTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "HashTableTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/HashTable.h"
-#include "Poco/NumberFormatter.h"
-
-
-using namespace Poco;
-
-
-HashTableTest::HashTableTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-HashTableTest::~HashTableTest()
-{
-}
-
-
-void HashTableTest::testInsert()
-{
-	std::string s1("str1");
-	std::string s2("str2");
-	HashTable<std::string, int> hashTable;
-	assert (!hashTable.exists(s1));
-	hashTable.insert(s1, 13);
-	assert (hashTable.exists(s1));
-	assert (hashTable.get(s1) == 13);
-	int retVal = 0;
-
-	assert (hashTable.get(s1, retVal));
-	assert (retVal == 13);
-	try
-	{
-		hashTable.insert(s1, 22);
-		failmsg ("duplicate insert must fail");
-	}
-	catch (Exception&){}
-	try
-	{
-		hashTable.get(s2);
-		failmsg ("getting a non inserted item must fail");
-	}
-	catch (Exception&){}
-
-	assert (!hashTable.exists(s2));
-	hashTable.insert(s2, 13);
-	assert (hashTable.exists(s2));
-}
-
-
-void HashTableTest::testUpdate()
-{
-	// add code for second test here
-	std::string s1("str1");
-	std::string s2("str2");
-	HashTable<std::string, int> hashTable;
-	hashTable.insert(s1, 13);
-	hashTable.update(s1, 14);
-	assert (hashTable.exists(s1));
-	assert (hashTable.get(s1) == 14);
-	int retVal = 0;
-
-	assert (hashTable.get(s1, retVal));
-	assert (retVal == 14);
-
-	// updating a non existing item must work too
-	hashTable.update(s2, 15);
-	assert (hashTable.get(s2) == 15);
-}
-
-
-void HashTableTest::testOverflow()
-{
-	HashTable<std::string, int> hashTable(13);
-	for (int i = 0; i < 1024; ++i)
-	{
-		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
-	}
-
-	for (int i = 0; i < 1024; ++i)
-	{
-		std::string tmp = Poco::NumberFormatter::format(i);
-		assert (hashTable.exists(tmp));
-		assert (hashTable.get(tmp) == i*i);
-	}
-}
-
-
-void HashTableTest::testSize()
-{
-	HashTable<std::string, int> hashTable(13);
-	assert (hashTable.size() == 0);
-	Poco::UInt32 h1 = hashTable.insert("1", 1);
-	assert (hashTable.size() == 1);
-	Poco::UInt32 h2 = hashTable.update("2", 2);
-	assert (hashTable.size() == 2);
-	hashTable.remove("1");
-	assert (hashTable.size() == 1);
-	hashTable.remove("3");
-	assert (hashTable.size() == 1);
-	hashTable.removeRaw("2", h2);
-	assert (hashTable.size() == 0);
-	hashTable.insert("1", 1);
-	hashTable.insert("2", 2);
-	assert (hashTable.size() == 2);
-	hashTable.clear();
-	assert (hashTable.size() == 0);
-}
-
-
-void HashTableTest::testResize()
-{
-	HashTable<std::string, int> hashTable(13);
-	assert (hashTable.size() == 0);
-	hashTable.resize(19);
-	for (int i = 0; i < 1024; ++i)
-	{
-		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
-	}
-	hashTable.resize(1009);
-
-	for (int i = 0; i < 1024; ++i)
-	{
-		std::string tmp = Poco::NumberFormatter::format(i);
-		assert (hashTable.exists(tmp));
-		assert (hashTable.get(tmp) == i*i);
-	}
-}
-
-
-void HashTableTest::testStatistic()
-{
-	double relax = 0.001;
-	HashTable<std::string, int> hashTable(13);
-	assert (hashTable.size() == 0);
-	HashStatistic stat1(hashTable.currentState());
-	assert (stat1.avgEntriesPerHash() < relax && stat1.avgEntriesPerHash() > -relax);
-	assert (stat1.maxPositionsOfTable() == 13);
-	assert (stat1.maxEntriesPerHash() == 0);
-
-	hashTable.resize(19);
-	stat1 = hashTable.currentState(true);
-	assert (stat1.avgEntriesPerHash() < relax && stat1.avgEntriesPerHash() > -relax);
-	assert (stat1.maxPositionsOfTable() == 19);
-	assert (stat1.maxEntriesPerHash() == 0);
-	assert (stat1.detailedEntriesPerHash().size() == 19);
-
-	for (int i = 0; i < 1024; ++i)
-	{
-		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
-	}
-	stat1 = hashTable.currentState(true);
-	double expAvg = 1024.0/ 19;
-	assert (stat1.avgEntriesPerHash() < (expAvg + relax) && stat1.avgEntriesPerHash() > (expAvg - relax));
-	assert (stat1.maxPositionsOfTable() == 19);
-	assert (stat1.maxEntriesPerHash() > expAvg);
-	hashTable.resize(1009);
-	stat1 = hashTable.currentState(true);
-
-	expAvg = 1024.0/ 1009;
-
-	assert (stat1.avgEntriesPerHash() < (expAvg + relax) && stat1.avgEntriesPerHash() > (expAvg - relax));
-	assert (stat1.maxPositionsOfTable() == 1009);
-	assert (stat1.maxEntriesPerHash() > expAvg);
-}
-
-
-void HashTableTest::setUp()
-{
-}
-
-
-void HashTableTest::tearDown()
-{
-}
-
-
-CppUnit::Test* HashTableTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashTableTest");
-
-	CppUnit_addTest(pSuite, HashTableTest, testInsert);
-	CppUnit_addTest(pSuite, HashTableTest, testUpdate);
-	CppUnit_addTest(pSuite, HashTableTest, testOverflow);
-	CppUnit_addTest(pSuite, HashTableTest, testSize);
-	CppUnit_addTest(pSuite, HashTableTest, testResize);
-	CppUnit_addTest(pSuite, HashTableTest, testStatistic);
-
-	return pSuite;
-}
+//
+// HashTableTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashTableTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "HashTableTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/HashTable.h"
+#include "Poco/NumberFormatter.h"
+
+
+using namespace Poco;
+
+
+HashTableTest::HashTableTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+HashTableTest::~HashTableTest()
+{
+}
+
+
+void HashTableTest::testInsert()
+{
+	std::string s1("str1");
+	std::string s2("str2");
+	HashTable<std::string, int> hashTable;
+	assert (!hashTable.exists(s1));
+	hashTable.insert(s1, 13);
+	assert (hashTable.exists(s1));
+	assert (hashTable.get(s1) == 13);
+	int retVal = 0;
+
+	assert (hashTable.get(s1, retVal));
+	assert (retVal == 13);
+	try
+	{
+		hashTable.insert(s1, 22);
+		failmsg ("duplicate insert must fail");
+	}
+	catch (Exception&){}
+	try
+	{
+		hashTable.get(s2);
+		failmsg ("getting a non inserted item must fail");
+	}
+	catch (Exception&){}
+
+	assert (!hashTable.exists(s2));
+	hashTable.insert(s2, 13);
+	assert (hashTable.exists(s2));
+}
+
+
+void HashTableTest::testUpdate()
+{
+	// add code for second test here
+	std::string s1("str1");
+	std::string s2("str2");
+	HashTable<std::string, int> hashTable;
+	hashTable.insert(s1, 13);
+	hashTable.update(s1, 14);
+	assert (hashTable.exists(s1));
+	assert (hashTable.get(s1) == 14);
+	int retVal = 0;
+
+	assert (hashTable.get(s1, retVal));
+	assert (retVal == 14);
+
+	// updating a non existing item must work too
+	hashTable.update(s2, 15);
+	assert (hashTable.get(s2) == 15);
+}
+
+
+void HashTableTest::testOverflow()
+{
+	HashTable<std::string, int> hashTable(13);
+	for (int i = 0; i < 1024; ++i)
+	{
+		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
+	}
+
+	for (int i = 0; i < 1024; ++i)
+	{
+		std::string tmp = Poco::NumberFormatter::format(i);
+		assert (hashTable.exists(tmp));
+		assert (hashTable.get(tmp) == i*i);
+	}
+}
+
+
+void HashTableTest::testSize()
+{
+	HashTable<std::string, int> hashTable(13);
+	assert (hashTable.size() == 0);
+	Poco::UInt32 h1 = hashTable.insert("1", 1);
+	assert (hashTable.size() == 1);
+	Poco::UInt32 h2 = hashTable.update("2", 2);
+	assert (hashTable.size() == 2);
+	hashTable.remove("1");
+	assert (hashTable.size() == 1);
+	hashTable.remove("3");
+	assert (hashTable.size() == 1);
+	hashTable.removeRaw("2", h2);
+	assert (hashTable.size() == 0);
+	hashTable.insert("1", 1);
+	hashTable.insert("2", 2);
+	assert (hashTable.size() == 2);
+	hashTable.clear();
+	assert (hashTable.size() == 0);
+}
+
+
+void HashTableTest::testResize()
+{
+	HashTable<std::string, int> hashTable(13);
+	assert (hashTable.size() == 0);
+	hashTable.resize(19);
+	for (int i = 0; i < 1024; ++i)
+	{
+		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
+	}
+	hashTable.resize(1009);
+
+	for (int i = 0; i < 1024; ++i)
+	{
+		std::string tmp = Poco::NumberFormatter::format(i);
+		assert (hashTable.exists(tmp));
+		assert (hashTable.get(tmp) == i*i);
+	}
+}
+
+
+void HashTableTest::testStatistic()
+{
+	double relax = 0.001;
+	HashTable<std::string, int> hashTable(13);
+	assert (hashTable.size() == 0);
+	HashStatistic stat1(hashTable.currentState());
+	assert (stat1.avgEntriesPerHash() < relax && stat1.avgEntriesPerHash() > -relax);
+	assert (stat1.maxPositionsOfTable() == 13);
+	assert (stat1.maxEntriesPerHash() == 0);
+
+	hashTable.resize(19);
+	stat1 = hashTable.currentState(true);
+	assert (stat1.avgEntriesPerHash() < relax && stat1.avgEntriesPerHash() > -relax);
+	assert (stat1.maxPositionsOfTable() == 19);
+	assert (stat1.maxEntriesPerHash() == 0);
+	assert (stat1.detailedEntriesPerHash().size() == 19);
+
+	for (int i = 0; i < 1024; ++i)
+	{
+		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
+	}
+	stat1 = hashTable.currentState(true);
+	double expAvg = 1024.0/ 19;
+	assert (stat1.avgEntriesPerHash() < (expAvg + relax) && stat1.avgEntriesPerHash() > (expAvg - relax));
+	assert (stat1.maxPositionsOfTable() == 19);
+	assert (stat1.maxEntriesPerHash() > expAvg);
+	hashTable.resize(1009);
+	stat1 = hashTable.currentState(true);
+
+	expAvg = 1024.0/ 1009;
+
+	assert (stat1.avgEntriesPerHash() < (expAvg + relax) && stat1.avgEntriesPerHash() > (expAvg - relax));
+	assert (stat1.maxPositionsOfTable() == 1009);
+	assert (stat1.maxEntriesPerHash() > expAvg);
+}
+
+
+void HashTableTest::setUp()
+{
+}
+
+
+void HashTableTest::tearDown()
+{
+}
+
+
+CppUnit::Test* HashTableTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashTableTest");
+
+	CppUnit_addTest(pSuite, HashTableTest, testInsert);
+	CppUnit_addTest(pSuite, HashTableTest, testUpdate);
+	CppUnit_addTest(pSuite, HashTableTest, testOverflow);
+	CppUnit_addTest(pSuite, HashTableTest, testSize);
+	CppUnit_addTest(pSuite, HashTableTest, testResize);
+	CppUnit_addTest(pSuite, HashTableTest, testStatistic);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/HashTableTest.h b/Foundation/testsuite/src/HashTableTest.h
index f7d178623..fd3754dd2 100644
--- a/Foundation/testsuite/src/HashTableTest.h
+++ b/Foundation/testsuite/src/HashTableTest.h
@@ -1,65 +1,65 @@
-//
-// HashTableTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashTableTest.h#2 $
-//
-// Definition of the HashTableTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef HashTableTest_INCLUDED
-#define HashTableTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class HashTableTest: public CppUnit::TestCase
-{
-public:
-	HashTableTest(const std::string& name);
-	~HashTableTest();
-
-	void testInsert();
-	void testOverflow();
-	void testUpdate();
-	void testSize();
-	void testResize();
-	void testStatistic();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // HashTableTest_INCLUDED
+//
+// HashTableTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashTableTest.h#2 $
+//
+// Definition of the HashTableTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef HashTableTest_INCLUDED
+#define HashTableTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class HashTableTest: public CppUnit::TestCase
+{
+public:
+	HashTableTest(const std::string& name);
+	~HashTableTest();
+
+	void testInsert();
+	void testOverflow();
+	void testUpdate();
+	void testSize();
+	void testResize();
+	void testStatistic();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // HashTableTest_INCLUDED
diff --git a/Foundation/testsuite/src/HashingTestSuite.cpp b/Foundation/testsuite/src/HashingTestSuite.cpp
index 4ca6da898..48eba9e20 100644
--- a/Foundation/testsuite/src/HashingTestSuite.cpp
+++ b/Foundation/testsuite/src/HashingTestSuite.cpp
@@ -1,52 +1,52 @@
-//
-// HashingTestSuite.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashingTestSuite.cpp#2 $
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "HashingTestSuite.h"
-#include "HashTableTest.h"
-#include "SimpleHashTableTest.h"
-#include "LinearHashTableTest.h"
-#include "HashSetTest.h"
-#include "HashMapTest.h"
-
-
-CppUnit::Test* HashingTestSuite::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashingTestSuite");
-
-	pSuite->addTest(HashTableTest::suite());
-	pSuite->addTest(SimpleHashTableTest::suite());
-	pSuite->addTest(LinearHashTableTest::suite());
-	pSuite->addTest(HashSetTest::suite());
-	pSuite->addTest(HashMapTest::suite());
-
-	return pSuite;
-}
+//
+// HashingTestSuite.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashingTestSuite.cpp#2 $
+//
+// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "HashingTestSuite.h"
+#include "HashTableTest.h"
+#include "SimpleHashTableTest.h"
+#include "LinearHashTableTest.h"
+#include "HashSetTest.h"
+#include "HashMapTest.h"
+
+
+CppUnit::Test* HashingTestSuite::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("HashingTestSuite");
+
+	pSuite->addTest(HashTableTest::suite());
+	pSuite->addTest(SimpleHashTableTest::suite());
+	pSuite->addTest(LinearHashTableTest::suite());
+	pSuite->addTest(HashSetTest::suite());
+	pSuite->addTest(HashMapTest::suite());
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/HashingTestSuite.h b/Foundation/testsuite/src/HashingTestSuite.h
index f9f180e97..9fa930e04 100644
--- a/Foundation/testsuite/src/HashingTestSuite.h
+++ b/Foundation/testsuite/src/HashingTestSuite.h
@@ -1,49 +1,49 @@
-//
-// HashingTestSuite.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/HashingTestSuite.h#2 $
-//
-// Definition of the HashingTestSuite class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef HashingTestSuite_INCLUDED
-#define HashingTestSuite_INCLUDED
-
-
-#include "CppUnit/TestSuite.h"
-
-
-class HashingTestSuite
-{
-public:
-	static CppUnit::Test* suite();
-};
-
-
-#endif // HashingTestSuite_INCLUDED
+//
+// HashingTestSuite.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/HashingTestSuite.h#2 $
+//
+// Definition of the HashingTestSuite class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef HashingTestSuite_INCLUDED
+#define HashingTestSuite_INCLUDED
+
+
+#include "CppUnit/TestSuite.h"
+
+
+class HashingTestSuite
+{
+public:
+	static CppUnit::Test* suite();
+};
+
+
+#endif // HashingTestSuite_INCLUDED
diff --git a/Foundation/testsuite/src/LinearHashTableTest.cpp b/Foundation/testsuite/src/LinearHashTableTest.cpp
index 3cc3b31b2..cd4eebb8f 100644
--- a/Foundation/testsuite/src/LinearHashTableTest.cpp
+++ b/Foundation/testsuite/src/LinearHashTableTest.cpp
@@ -1,374 +1,374 @@
-//
-// LinearHashTableTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/LinearHashTableTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "LinearHashTableTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/LinearHashTable.h"
-#include "Poco/HashTable.h"
-#include "Poco/Stopwatch.h"
-#include "Poco/NumberFormatter.h"
-#include <set>
-#include <iostream>
-
-
-using Poco::LinearHashTable;
-using Poco::HashTable;
-using Poco::Stopwatch;
-using Poco::NumberFormatter;
-
-
-LinearHashTableTest::LinearHashTableTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-LinearHashTableTest::~LinearHashTableTest()
-{
-}
-
-
-void LinearHashTableTest::testInsert()
-{
-	const int N = 1000;
-
-	LinearHashTable<int> ht;
-	
-	assert (ht.empty());
-	
-	for (int i = 0; i < N; ++i)
-	{
-		std::pair<LinearHashTable<int>::Iterator, bool> res = ht.insert(i);
-		assert (*res.first == i);
-		assert (res.second);
-		LinearHashTable<int>::Iterator it = ht.find(i);
-		assert (it != ht.end());
-		assert (*it == i);
-		assert (ht.size() == i + 1);
-	}		
-	
-	assert (!ht.empty());
-	
-	for (int i = 0; i < N; ++i)
-	{
-		LinearHashTable<int>::Iterator it = ht.find(i);
-		assert (it != ht.end());
-		assert (*it == i);
-	}
-	
-	for (int i = 0; i < N; ++i)
-	{
-		std::pair<LinearHashTable<int>::Iterator, bool> res = ht.insert(i);
-		assert (*res.first == i);
-		assert (!res.second);
-	}		
-}
-
-
-void LinearHashTableTest::testErase()
-{
-	const int N = 1000;
-
-	LinearHashTable<int> ht;
-
-	for (int i = 0; i < N; ++i)
-	{
-		ht.insert(i);
-	}
-	assert (ht.size() == N);
-	
-	for (int i = 0; i < N; i += 2)
-	{
-		ht.erase(i);
-		LinearHashTable<int>::Iterator it = ht.find(i);
-		assert (it == ht.end());
-	}
-	assert (ht.size() == N/2);
-	
-	for (int i = 0; i < N; i += 2)
-	{
-		LinearHashTable<int>::Iterator it = ht.find(i);
-		assert (it == ht.end());
-	}
-	
-	for (int i = 1; i < N; i += 2)
-	{
-		LinearHashTable<int>::Iterator it = ht.find(i);
-		assert (it != ht.end());
-		assert (*it == i);
-	}
-
-	for (int i = 0; i < N; i += 2)
-	{
-		ht.insert(i);
-	}
-	
-	for (int i = 0; i < N; ++i)
-	{
-		LinearHashTable<int>::Iterator it = ht.find(i);
-		assert (it != ht.end());
-		assert (*it == i);
-	}
-}
-
-
-void LinearHashTableTest::testIterator()
-{
-	const int N = 1000;
-
-	LinearHashTable<int> ht;
-
-	for (int i = 0; i < N; ++i)
-	{
-		ht.insert(i);
-	}
-	
-	std::set<int> values;
-	LinearHashTable<int>::Iterator it = ht.begin();
-	while (it != ht.end())
-	{
-		assert (values.find(*it) == values.end());
-		values.insert(*it);
-		++it;
-	}
-	
-	assert (values.size() == N);
-}
-
-
-void LinearHashTableTest::testConstIterator()
-{
-	const int N = 1000;
-
-	LinearHashTable<int> ht;
-
-	for (int i = 0; i < N; ++i)
-	{
-		ht.insert(i);
-	}
-	
-	std::set<int> values;
-	LinearHashTable<int>::ConstIterator it = ht.begin();
-	while (it != ht.end())
-	{
-		assert (values.find(*it) == values.end());
-		values.insert(*it);
-		++it;
-	}
-	
-	assert (values.size() == N);
-	
-	values.clear();
-	const LinearHashTable<int> cht(ht);
-
-	LinearHashTable<int>::ConstIterator cit = cht.begin();
-	while (cit != cht.end())
-	{
-		assert (values.find(*cit) == values.end());
-		values.insert(*cit);
-		++cit;
-	}
-	
-	assert (values.size() == N);	
-}
-
-
-void LinearHashTableTest::testPerformanceInt()
-{
-	const int N = 5000000;
-	Stopwatch sw;
-
-	{
-		LinearHashTable<int> lht(N);
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			lht.insert(i);
-		}
-		sw.stop();
-		std::cout << "Insert LHT: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			lht.find(i);
-		}
-		sw.stop();
-		std::cout << "Find LHT: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-	}
-
-	{
-		HashTable<int, int> ht;
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			ht.insert(i, i);
-		}
-		sw.stop();
-		std::cout << "Insert HT: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			ht.exists(i);
-		}
-		sw.stop();
-		std::cout << "Find HT: " << sw.elapsedSeconds() << std::endl;
-	}
-	
-	{
-		std::set<int> s;
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			s.insert(i);
-		}
-		sw.stop();
-		std::cout << "Insert set: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			s.find(i);
-		}
-		sw.stop();
-		std::cout << "Find set: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-	}
-	
-}
-
-
-void LinearHashTableTest::testPerformanceStr()
-{
-	const int N = 5000000;
-	Stopwatch sw;
-	
-	std::vector<std::string> values;
-	for (int i = 0; i < N; ++i)
-	{
-		values.push_back(NumberFormatter::format0(i, 8));
-	}
-
-	{
-		LinearHashTable<std::string> lht(N);
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			lht.insert(values[i]);
-		}
-		sw.stop();
-		std::cout << "Insert LHT: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			lht.find(values[i]);
-		}
-		sw.stop();
-		std::cout << "Find LHT: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-	}
-
-	{
-		HashTable<std::string, int> ht;
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			ht.insert(values[i], i);
-		}
-		sw.stop();
-		std::cout << "Insert HT: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			ht.exists(values[i]);
-		}
-		sw.stop();
-		std::cout << "Find HT: " << sw.elapsedSeconds() << std::endl;
-	}
-	
-	{
-		std::set<std::string> s;
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			s.insert(values[i]);
-		}
-		sw.stop();
-		std::cout << "Insert set: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-		
-		sw.start();
-		for (int i = 0; i < N; ++i)
-		{
-			s.find(values[i]);
-		}
-		sw.stop();
-		std::cout << "Find set: " << sw.elapsedSeconds() << std::endl;
-		sw.reset();
-	}
-}
-
-
-void LinearHashTableTest::setUp()
-{
-}
-
-
-void LinearHashTableTest::tearDown()
-{
-}
-
-
-CppUnit::Test* LinearHashTableTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("LinearHashTableTest");
-
-	CppUnit_addTest(pSuite, LinearHashTableTest, testInsert);
-	CppUnit_addTest(pSuite, LinearHashTableTest, testErase);
-	CppUnit_addTest(pSuite, LinearHashTableTest, testIterator);
-	CppUnit_addTest(pSuite, LinearHashTableTest, testConstIterator);
-	//CppUnit_addTest(pSuite, LinearHashTableTest, testPerformanceInt);
-	//CppUnit_addTest(pSuite, LinearHashTableTest, testPerformanceStr);
-
-	return pSuite;
-}
+//
+// LinearHashTableTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/LinearHashTableTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "LinearHashTableTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/LinearHashTable.h"
+#include "Poco/HashTable.h"
+#include "Poco/Stopwatch.h"
+#include "Poco/NumberFormatter.h"
+#include <set>
+#include <iostream>
+
+
+using Poco::LinearHashTable;
+using Poco::HashTable;
+using Poco::Stopwatch;
+using Poco::NumberFormatter;
+
+
+LinearHashTableTest::LinearHashTableTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+LinearHashTableTest::~LinearHashTableTest()
+{
+}
+
+
+void LinearHashTableTest::testInsert()
+{
+	const int N = 1000;
+
+	LinearHashTable<int> ht;
+	
+	assert (ht.empty());
+	
+	for (int i = 0; i < N; ++i)
+	{
+		std::pair<LinearHashTable<int>::Iterator, bool> res = ht.insert(i);
+		assert (*res.first == i);
+		assert (res.second);
+		LinearHashTable<int>::Iterator it = ht.find(i);
+		assert (it != ht.end());
+		assert (*it == i);
+		assert (ht.size() == i + 1);
+	}		
+	
+	assert (!ht.empty());
+	
+	for (int i = 0; i < N; ++i)
+	{
+		LinearHashTable<int>::Iterator it = ht.find(i);
+		assert (it != ht.end());
+		assert (*it == i);
+	}
+	
+	for (int i = 0; i < N; ++i)
+	{
+		std::pair<LinearHashTable<int>::Iterator, bool> res = ht.insert(i);
+		assert (*res.first == i);
+		assert (!res.second);
+	}		
+}
+
+
+void LinearHashTableTest::testErase()
+{
+	const int N = 1000;
+
+	LinearHashTable<int> ht;
+
+	for (int i = 0; i < N; ++i)
+	{
+		ht.insert(i);
+	}
+	assert (ht.size() == N);
+	
+	for (int i = 0; i < N; i += 2)
+	{
+		ht.erase(i);
+		LinearHashTable<int>::Iterator it = ht.find(i);
+		assert (it == ht.end());
+	}
+	assert (ht.size() == N/2);
+	
+	for (int i = 0; i < N; i += 2)
+	{
+		LinearHashTable<int>::Iterator it = ht.find(i);
+		assert (it == ht.end());
+	}
+	
+	for (int i = 1; i < N; i += 2)
+	{
+		LinearHashTable<int>::Iterator it = ht.find(i);
+		assert (it != ht.end());
+		assert (*it == i);
+	}
+
+	for (int i = 0; i < N; i += 2)
+	{
+		ht.insert(i);
+	}
+	
+	for (int i = 0; i < N; ++i)
+	{
+		LinearHashTable<int>::Iterator it = ht.find(i);
+		assert (it != ht.end());
+		assert (*it == i);
+	}
+}
+
+
+void LinearHashTableTest::testIterator()
+{
+	const int N = 1000;
+
+	LinearHashTable<int> ht;
+
+	for (int i = 0; i < N; ++i)
+	{
+		ht.insert(i);
+	}
+	
+	std::set<int> values;
+	LinearHashTable<int>::Iterator it = ht.begin();
+	while (it != ht.end())
+	{
+		assert (values.find(*it) == values.end());
+		values.insert(*it);
+		++it;
+	}
+	
+	assert (values.size() == N);
+}
+
+
+void LinearHashTableTest::testConstIterator()
+{
+	const int N = 1000;
+
+	LinearHashTable<int> ht;
+
+	for (int i = 0; i < N; ++i)
+	{
+		ht.insert(i);
+	}
+	
+	std::set<int> values;
+	LinearHashTable<int>::ConstIterator it = ht.begin();
+	while (it != ht.end())
+	{
+		assert (values.find(*it) == values.end());
+		values.insert(*it);
+		++it;
+	}
+	
+	assert (values.size() == N);
+	
+	values.clear();
+	const LinearHashTable<int> cht(ht);
+
+	LinearHashTable<int>::ConstIterator cit = cht.begin();
+	while (cit != cht.end())
+	{
+		assert (values.find(*cit) == values.end());
+		values.insert(*cit);
+		++cit;
+	}
+	
+	assert (values.size() == N);	
+}
+
+
+void LinearHashTableTest::testPerformanceInt()
+{
+	const int N = 5000000;
+	Stopwatch sw;
+
+	{
+		LinearHashTable<int> lht(N);
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			lht.insert(i);
+		}
+		sw.stop();
+		std::cout << "Insert LHT: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			lht.find(i);
+		}
+		sw.stop();
+		std::cout << "Find LHT: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+	}
+
+	{
+		HashTable<int, int> ht;
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			ht.insert(i, i);
+		}
+		sw.stop();
+		std::cout << "Insert HT: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			ht.exists(i);
+		}
+		sw.stop();
+		std::cout << "Find HT: " << sw.elapsedSeconds() << std::endl;
+	}
+	
+	{
+		std::set<int> s;
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			s.insert(i);
+		}
+		sw.stop();
+		std::cout << "Insert set: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			s.find(i);
+		}
+		sw.stop();
+		std::cout << "Find set: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+	}
+	
+}
+
+
+void LinearHashTableTest::testPerformanceStr()
+{
+	const int N = 5000000;
+	Stopwatch sw;
+	
+	std::vector<std::string> values;
+	for (int i = 0; i < N; ++i)
+	{
+		values.push_back(NumberFormatter::format0(i, 8));
+	}
+
+	{
+		LinearHashTable<std::string> lht(N);
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			lht.insert(values[i]);
+		}
+		sw.stop();
+		std::cout << "Insert LHT: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			lht.find(values[i]);
+		}
+		sw.stop();
+		std::cout << "Find LHT: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+	}
+
+	{
+		HashTable<std::string, int> ht;
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			ht.insert(values[i], i);
+		}
+		sw.stop();
+		std::cout << "Insert HT: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			ht.exists(values[i]);
+		}
+		sw.stop();
+		std::cout << "Find HT: " << sw.elapsedSeconds() << std::endl;
+	}
+	
+	{
+		std::set<std::string> s;
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			s.insert(values[i]);
+		}
+		sw.stop();
+		std::cout << "Insert set: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+		
+		sw.start();
+		for (int i = 0; i < N; ++i)
+		{
+			s.find(values[i]);
+		}
+		sw.stop();
+		std::cout << "Find set: " << sw.elapsedSeconds() << std::endl;
+		sw.reset();
+	}
+}
+
+
+void LinearHashTableTest::setUp()
+{
+}
+
+
+void LinearHashTableTest::tearDown()
+{
+}
+
+
+CppUnit::Test* LinearHashTableTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("LinearHashTableTest");
+
+	CppUnit_addTest(pSuite, LinearHashTableTest, testInsert);
+	CppUnit_addTest(pSuite, LinearHashTableTest, testErase);
+	CppUnit_addTest(pSuite, LinearHashTableTest, testIterator);
+	CppUnit_addTest(pSuite, LinearHashTableTest, testConstIterator);
+	//CppUnit_addTest(pSuite, LinearHashTableTest, testPerformanceInt);
+	//CppUnit_addTest(pSuite, LinearHashTableTest, testPerformanceStr);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/LinearHashTableTest.h b/Foundation/testsuite/src/LinearHashTableTest.h
index 09d10a134..c41d8c75a 100644
--- a/Foundation/testsuite/src/LinearHashTableTest.h
+++ b/Foundation/testsuite/src/LinearHashTableTest.h
@@ -1,65 +1,65 @@
-//
-// LinearHashTableTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/LinearHashTableTest.h#2 $
-//
-// Definition of the LinearHashTableTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef LinearHashTableTest_INCLUDED
-#define LinearHashTableTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class LinearHashTableTest: public CppUnit::TestCase
-{
-public:
-	LinearHashTableTest(const std::string& name);
-	~LinearHashTableTest();
-
-	void testInsert();
-	void testErase();
-	void testIterator();
-	void testConstIterator();
-	void testPerformanceInt();
-	void testPerformanceStr();
-	
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // LinearHashTableTest_INCLUDED
+//
+// LinearHashTableTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/LinearHashTableTest.h#2 $
+//
+// Definition of the LinearHashTableTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef LinearHashTableTest_INCLUDED
+#define LinearHashTableTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class LinearHashTableTest: public CppUnit::TestCase
+{
+public:
+	LinearHashTableTest(const std::string& name);
+	~LinearHashTableTest();
+
+	void testInsert();
+	void testErase();
+	void testIterator();
+	void testConstIterator();
+	void testPerformanceInt();
+	void testPerformanceStr();
+	
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // LinearHashTableTest_INCLUDED
diff --git a/Foundation/testsuite/src/NamedTuplesTest.cpp b/Foundation/testsuite/src/NamedTuplesTest.cpp
index 2015998b5..ec7d7a5c4 100644
--- a/Foundation/testsuite/src/NamedTuplesTest.cpp
+++ b/Foundation/testsuite/src/NamedTuplesTest.cpp
@@ -1,1663 +1,1663 @@
-//
-// NamedTuplesTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/NamedTuplesTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "NamedTuplesTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/NamedTuple.h"
-#include "Poco/Exception.h"
-
-using Poco::NamedTuple;
-using Poco::Int8;
-using Poco::UInt8;
-using Poco::Int16;
-using Poco::UInt16;
-using Poco::Int32;
-using Poco::UInt32;
-using Poco::Int8;
-using Poco::UInt8;
-using Poco::Int16;
-using Poco::UInt16;
-using Poco::Int32;
-using Poco::UInt32;
-using Poco::NotFoundException;
-using Poco::InvalidArgumentException;
-
-NamedTuplesTest::NamedTuplesTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-NamedTuplesTest::~NamedTuplesTest()
-{
-}
-
-
-void NamedTuplesTest::testNamedTuple1()
-{
-	typedef NamedTuple<std::string> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 1);
-    
-    TupleType aTuple2("string1", "1");
-	assert (aTuple2["string1"] == "1");
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.set<0>("2");
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3.length == 1);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple2()
-{
-	typedef NamedTuple<std::string, int> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0); 
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 2);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3.length == 2);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple3()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false); 
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 3);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3.length == 3);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple4()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false); 
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 4);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3.length == 4);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple5()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 5);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c');
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3.length == 5);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple6()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 6);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3.length == 6);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple7()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 7);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3.length == 7);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple8()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 8);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3.length == 8);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-
-void NamedTuplesTest::testNamedTuple9()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 9);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2");
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3.length == 9);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple10()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 10);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2 );
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3.length == 10);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple11()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 11);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3");
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3.length == 11);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple12()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 12);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3.length == 12);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple13()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 13);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3.length == 13);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple14()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 14);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3.length == 14);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple15()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 15);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5,
-        "char2", 'c');
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["char2"] == 'c');
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3["bool2"] == false);
-	assert (aTuple3.length == 15);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple16()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-	assert (aTuple["O"] == 0); 
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 16);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5,
-        "char2", 'c',
-        "long2", 999);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["char2"] == 'c');
-	assert (aTuple2["long2"] == 999); 
-	assert (aTuple2.length == 16);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3["bool2"] == false);
-	assert (aTuple3["char2"] == 0); 
-	assert (aTuple3.length == 16);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple17()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-	assert (aTuple["O"] == 0); 
-	assert (aTuple["P"] == 0);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 17);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5,
-        "char2", 'c',
-        "long2", 999,
-        "double2", 2.5);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["char2"] == 'c');
-	assert (aTuple2["long2"] == 999); 
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2.length == 17);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3["bool2"] == false);
-	assert (aTuple3["char2"] == 0);
-	assert (aTuple3["long2"] == 0); 
-	assert (aTuple3.length == 17);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple18()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-	assert (aTuple["O"] == 0); 
-	assert (aTuple["P"] == 0);
-	assert (aTuple["R"] == 0);
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 18);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5,
-        "char2", 'c',
-        "long2", 999,
-        "double2", 2.5,
-        "short2", 32700);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["char2"] == 'c');
-	assert (aTuple2["long2"] == 999); 
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["short2"] == 32700);
-	assert (aTuple2.length == 18);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3["bool2"] == false);
-	assert (aTuple3["char2"] == 0);
-	assert (aTuple3["long2"] == 0);
-	assert (aTuple3["short2"] == 0); 
-	assert (aTuple3.length == 18);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple19()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-	assert (aTuple["O"] == 0); 
-	assert (aTuple["P"] == 0);
-	assert (aTuple["R"] == 0);
-	assert (aTuple["S"] == "");
-
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 19);
-    
-    TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5,
-        "char2", 'c',
-        "long2", 999,
-        "double2", 2.5,
-        "short2", 32700, 
-        "string4", "4");
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["char2"] == 'c');
-	assert (aTuple2["long2"] == 999); 
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["short2"] == 32700);
-	assert (aTuple2["string4"] == "4");
-	assert (aTuple2.length == 19);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3["bool2"] == false);
-	assert (aTuple3["char2"] == 0);
-	assert (aTuple3["long2"] == 0);
-	assert (aTuple3["short2"] == 0); 
-	assert (aTuple3["string4"] == "");
-	assert (aTuple3.length == 19);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::testNamedTuple20()
-{
-	typedef NamedTuple<std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int,
-		std::string, 
-		int, 
-		bool, 
-		float, 
-		char, 
-		long, 
-		double, 
-		short, 
-		std::string, 
-		int> TupleType;
-
-	TupleType aTuple; 
-
-	assert (aTuple["A"] == "");
-	assert (aTuple["B"] == 0);
-	assert (aTuple["C"] == false);
-	assert (aTuple["E"] == 0); 
-	assert (aTuple["F"] == 0);
-	assert (aTuple["H"] == 0);
-	assert (aTuple["I"] == "");
-	assert (aTuple["J"] == 0); 
-	assert (aTuple["K"] == "");
-	assert (aTuple["L"] == 0);
-	assert (aTuple["M"] == false);
-	assert (aTuple["O"] == 0); 
-	assert (aTuple["P"] == 0);
-	assert (aTuple["R"] == 0);
-	assert (aTuple["S"] == "");
-	assert (aTuple["T"] == 0);
-	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
-	catch (NotFoundException&) { }
-	assert (aTuple.length == 20);
-    
-   TupleType aTuple2("string1", "1", 
-        "int1", 1,
-        "bool1", true,
-        "float1", 1.5f,
-        "char1", 'c',
-        "long1", 999,
-        "double1", 1.5,
-        "short1", 32700, 
-        "string2", "2",
-        "int2", 2,
-		"string3", "3", 
-        "int3", 3, 
-        "bool2", true,
-        "float2", 2.5,
-        "char2", 'c',
-        "long2", 999,
-        "double2", 2.5,
-        "short2", 32700, 
-        "string4", "4",
-        "int4", 4);
-	assert (aTuple2["string1"] == "1");
-	assert (aTuple2["int1"] == 1); 
-	assert (aTuple2["bool1"] == true);
-	assert (aTuple2["float1"] == 1.5);
-	assert (aTuple2["char1"] == 'c');
-	assert (aTuple2["long1"] == 999); 
-	assert (aTuple2["double1"] == 1.5);
-	assert (aTuple2["short1"] == 32700);
-	assert (aTuple2["string2"] == "2");
-	assert (aTuple2["int2"] == 2); 
-	assert (aTuple2["string3"] == "3");
-	assert (aTuple2["int3"] == 3); 
-	assert (aTuple2["bool2"] == true);
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["char2"] == 'c');
-	assert (aTuple2["long2"] == 999); 
-	assert (aTuple2["float2"] == 2.5);
-	assert (aTuple2["short2"] == 32700);
-	assert (aTuple2["string4"] == "4");
-	assert (aTuple2["int4"] == 4); 
-	assert (aTuple2.length == 20);
-
-	assert (aTuple != aTuple2);
-    aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-    aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-    TupleType aTuple3(aTuple2.names());
-	assert (aTuple3.names() == aTuple2.names());
-	assert (aTuple3["string1"] == "");
-	assert (aTuple3["int1"] == 0); 
-	assert (aTuple3["bool1"] == false);
-	assert (aTuple3["char1"] == 0);
-	assert (aTuple3["long1"] == 0);
-	assert (aTuple3["short1"] == 0); 
-	assert (aTuple3["string2"] == "");
-	assert (aTuple3["int2"] == 0);
-	assert (aTuple3["string3"] == "");
-	assert (aTuple3["int3"] == 0); 
-	assert (aTuple3["bool2"] == false);
-	assert (aTuple3["char2"] == 0);
-	assert (aTuple3["long2"] == 0);
-	assert (aTuple3["short2"] == 0); 
-	assert (aTuple3["string4"] == "");
-	assert (aTuple3["int4"] == 0);
-	assert (aTuple3.length == 20);
-
-	assert (aTuple.getName(0) == "string1");
-	aTuple.setName(0, "New Name");
-	assert (aTuple.getName(0) == "New Name");
-
-	try { aTuple.setName(20, ""); fail("must fail"); }
-	catch (InvalidArgumentException&) { }
-}
-
-
-void NamedTuplesTest::setUp()
-{
-}
-
-
-void NamedTuplesTest::tearDown()
-{
-}
-
-
-CppUnit::Test* NamedTuplesTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("NamedTuplesTest");
-
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple1);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple2);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple3);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple4);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple5);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple6);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple7);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple8);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple9);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple10);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple11);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple12);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple13);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple14);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple15);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple16);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple17);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple18);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple19);
-	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple20);
-
-	return pSuite;
-}
+//
+// NamedTuplesTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/NamedTuplesTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "NamedTuplesTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/NamedTuple.h"
+#include "Poco/Exception.h"
+
+using Poco::NamedTuple;
+using Poco::Int8;
+using Poco::UInt8;
+using Poco::Int16;
+using Poco::UInt16;
+using Poco::Int32;
+using Poco::UInt32;
+using Poco::Int8;
+using Poco::UInt8;
+using Poco::Int16;
+using Poco::UInt16;
+using Poco::Int32;
+using Poco::UInt32;
+using Poco::NotFoundException;
+using Poco::InvalidArgumentException;
+
+NamedTuplesTest::NamedTuplesTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+NamedTuplesTest::~NamedTuplesTest()
+{
+}
+
+
+void NamedTuplesTest::testNamedTuple1()
+{
+	typedef NamedTuple<std::string> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 1);
+    
+    TupleType aTuple2("string1", "1");
+	assert (aTuple2["string1"] == "1");
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.set<0>("2");
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3.length == 1);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple2()
+{
+	typedef NamedTuple<std::string, int> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0); 
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 2);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3.length == 2);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple3()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false); 
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 3);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3.length == 3);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple4()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false); 
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 4);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3.length == 4);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple5()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 5);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c');
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3.length == 5);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple6()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 6);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3.length == 6);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple7()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 7);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3.length == 7);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple8()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 8);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3.length == 8);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+
+void NamedTuplesTest::testNamedTuple9()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 9);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2");
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3.length == 9);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple10()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 10);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2 );
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3.length == 10);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple11()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 11);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3");
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3.length == 11);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple12()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 12);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3.length == 12);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple13()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 13);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3.length == 13);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple14()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 14);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3.length == 14);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple15()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float, 
+		char> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 15);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5,
+        "char2", 'c');
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["char2"] == 'c');
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3["bool2"] == false);
+	assert (aTuple3.length == 15);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple16()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+	assert (aTuple["O"] == 0); 
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 16);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5,
+        "char2", 'c',
+        "long2", 999);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["char2"] == 'c');
+	assert (aTuple2["long2"] == 999); 
+	assert (aTuple2.length == 16);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3["bool2"] == false);
+	assert (aTuple3["char2"] == 0); 
+	assert (aTuple3.length == 16);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple17()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+	assert (aTuple["O"] == 0); 
+	assert (aTuple["P"] == 0);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 17);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5,
+        "char2", 'c',
+        "long2", 999,
+        "double2", 2.5);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["char2"] == 'c');
+	assert (aTuple2["long2"] == 999); 
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2.length == 17);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3["bool2"] == false);
+	assert (aTuple3["char2"] == 0);
+	assert (aTuple3["long2"] == 0); 
+	assert (aTuple3.length == 17);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple18()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+	assert (aTuple["O"] == 0); 
+	assert (aTuple["P"] == 0);
+	assert (aTuple["R"] == 0);
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 18);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5,
+        "char2", 'c',
+        "long2", 999,
+        "double2", 2.5,
+        "short2", 32700);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["char2"] == 'c');
+	assert (aTuple2["long2"] == 999); 
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["short2"] == 32700);
+	assert (aTuple2.length == 18);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3["bool2"] == false);
+	assert (aTuple3["char2"] == 0);
+	assert (aTuple3["long2"] == 0);
+	assert (aTuple3["short2"] == 0); 
+	assert (aTuple3.length == 18);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple19()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+	assert (aTuple["O"] == 0); 
+	assert (aTuple["P"] == 0);
+	assert (aTuple["R"] == 0);
+	assert (aTuple["S"] == "");
+
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 19);
+    
+    TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5,
+        "char2", 'c',
+        "long2", 999,
+        "double2", 2.5,
+        "short2", 32700, 
+        "string4", "4");
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["char2"] == 'c');
+	assert (aTuple2["long2"] == 999); 
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["short2"] == 32700);
+	assert (aTuple2["string4"] == "4");
+	assert (aTuple2.length == 19);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3["bool2"] == false);
+	assert (aTuple3["char2"] == 0);
+	assert (aTuple3["long2"] == 0);
+	assert (aTuple3["short2"] == 0); 
+	assert (aTuple3["string4"] == "");
+	assert (aTuple3.length == 19);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::testNamedTuple20()
+{
+	typedef NamedTuple<std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int,
+		std::string, 
+		int, 
+		bool, 
+		float, 
+		char, 
+		long, 
+		double, 
+		short, 
+		std::string, 
+		int> TupleType;
+
+	TupleType aTuple; 
+
+	assert (aTuple["A"] == "");
+	assert (aTuple["B"] == 0);
+	assert (aTuple["C"] == false);
+	assert (aTuple["E"] == 0); 
+	assert (aTuple["F"] == 0);
+	assert (aTuple["H"] == 0);
+	assert (aTuple["I"] == "");
+	assert (aTuple["J"] == 0); 
+	assert (aTuple["K"] == "");
+	assert (aTuple["L"] == 0);
+	assert (aTuple["M"] == false);
+	assert (aTuple["O"] == 0); 
+	assert (aTuple["P"] == 0);
+	assert (aTuple["R"] == 0);
+	assert (aTuple["S"] == "");
+	assert (aTuple["T"] == 0);
+	try { int xyz; xyz = aTuple["XYZ"]; fail ("must fail"); }
+	catch (NotFoundException&) { }
+	assert (aTuple.length == 20);
+    
+   TupleType aTuple2("string1", "1", 
+        "int1", 1,
+        "bool1", true,
+        "float1", 1.5f,
+        "char1", 'c',
+        "long1", 999,
+        "double1", 1.5,
+        "short1", 32700, 
+        "string2", "2",
+        "int2", 2,
+		"string3", "3", 
+        "int3", 3, 
+        "bool2", true,
+        "float2", 2.5,
+        "char2", 'c',
+        "long2", 999,
+        "double2", 2.5,
+        "short2", 32700, 
+        "string4", "4",
+        "int4", 4);
+	assert (aTuple2["string1"] == "1");
+	assert (aTuple2["int1"] == 1); 
+	assert (aTuple2["bool1"] == true);
+	assert (aTuple2["float1"] == 1.5);
+	assert (aTuple2["char1"] == 'c');
+	assert (aTuple2["long1"] == 999); 
+	assert (aTuple2["double1"] == 1.5);
+	assert (aTuple2["short1"] == 32700);
+	assert (aTuple2["string2"] == "2");
+	assert (aTuple2["int2"] == 2); 
+	assert (aTuple2["string3"] == "3");
+	assert (aTuple2["int3"] == 3); 
+	assert (aTuple2["bool2"] == true);
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["char2"] == 'c');
+	assert (aTuple2["long2"] == 999); 
+	assert (aTuple2["float2"] == 2.5);
+	assert (aTuple2["short2"] == 32700);
+	assert (aTuple2["string4"] == "4");
+	assert (aTuple2["int4"] == 4); 
+	assert (aTuple2.length == 20);
+
+	assert (aTuple != aTuple2);
+    aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+    aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+    TupleType aTuple3(aTuple2.names());
+	assert (aTuple3.names() == aTuple2.names());
+	assert (aTuple3["string1"] == "");
+	assert (aTuple3["int1"] == 0); 
+	assert (aTuple3["bool1"] == false);
+	assert (aTuple3["char1"] == 0);
+	assert (aTuple3["long1"] == 0);
+	assert (aTuple3["short1"] == 0); 
+	assert (aTuple3["string2"] == "");
+	assert (aTuple3["int2"] == 0);
+	assert (aTuple3["string3"] == "");
+	assert (aTuple3["int3"] == 0); 
+	assert (aTuple3["bool2"] == false);
+	assert (aTuple3["char2"] == 0);
+	assert (aTuple3["long2"] == 0);
+	assert (aTuple3["short2"] == 0); 
+	assert (aTuple3["string4"] == "");
+	assert (aTuple3["int4"] == 0);
+	assert (aTuple3.length == 20);
+
+	assert (aTuple.getName(0) == "string1");
+	aTuple.setName(0, "New Name");
+	assert (aTuple.getName(0) == "New Name");
+
+	try { aTuple.setName(20, ""); fail("must fail"); }
+	catch (InvalidArgumentException&) { }
+}
+
+
+void NamedTuplesTest::setUp()
+{
+}
+
+
+void NamedTuplesTest::tearDown()
+{
+}
+
+
+CppUnit::Test* NamedTuplesTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("NamedTuplesTest");
+
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple1);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple2);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple3);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple4);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple5);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple6);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple7);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple8);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple9);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple10);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple11);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple12);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple13);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple14);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple15);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple16);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple17);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple18);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple19);
+	CppUnit_addTest(pSuite, NamedTuplesTest, testNamedTuple20);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/NamedTuplesTest.h b/Foundation/testsuite/src/NamedTuplesTest.h
index 378da4e80..c08e726cc 100644
--- a/Foundation/testsuite/src/NamedTuplesTest.h
+++ b/Foundation/testsuite/src/NamedTuplesTest.h
@@ -1,79 +1,79 @@
-//
-// NamedTuplesTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/NamedTuplesTest.h#2 $
-//
-// Definition of the NamedTuplesTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef NamedTuplesTest_INCLUDED
-#define NamedTuplesTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class NamedTuplesTest: public CppUnit::TestCase
-{
-public:
-	NamedTuplesTest(const std::string& name);
-	~NamedTuplesTest();
-
-	void testNamedTuple1();
-	void testNamedTuple2();
-	void testNamedTuple3();
-	void testNamedTuple4();
-	void testNamedTuple5();
-	void testNamedTuple6();
-	void testNamedTuple7();
-	void testNamedTuple8();
-	void testNamedTuple9();
-	void testNamedTuple10();
-	void testNamedTuple11();
-	void testNamedTuple12();
-	void testNamedTuple13();
-	void testNamedTuple14();
-	void testNamedTuple15();
-	void testNamedTuple16();
-	void testNamedTuple17();
-	void testNamedTuple18();
-	void testNamedTuple19();
-	void testNamedTuple20();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // NamedTuplesTest_INCLUDED
+//
+// NamedTuplesTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/NamedTuplesTest.h#2 $
+//
+// Definition of the NamedTuplesTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef NamedTuplesTest_INCLUDED
+#define NamedTuplesTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class NamedTuplesTest: public CppUnit::TestCase
+{
+public:
+	NamedTuplesTest(const std::string& name);
+	~NamedTuplesTest();
+
+	void testNamedTuple1();
+	void testNamedTuple2();
+	void testNamedTuple3();
+	void testNamedTuple4();
+	void testNamedTuple5();
+	void testNamedTuple6();
+	void testNamedTuple7();
+	void testNamedTuple8();
+	void testNamedTuple9();
+	void testNamedTuple10();
+	void testNamedTuple11();
+	void testNamedTuple12();
+	void testNamedTuple13();
+	void testNamedTuple14();
+	void testNamedTuple15();
+	void testNamedTuple16();
+	void testNamedTuple17();
+	void testNamedTuple18();
+	void testNamedTuple19();
+	void testNamedTuple20();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // NamedTuplesTest_INCLUDED
diff --git a/Foundation/testsuite/src/SharedMemoryTest.cpp b/Foundation/testsuite/src/SharedMemoryTest.cpp
index 86ac8abf4..a61bb9b81 100644
--- a/Foundation/testsuite/src/SharedMemoryTest.cpp
+++ b/Foundation/testsuite/src/SharedMemoryTest.cpp
@@ -1,116 +1,116 @@
-//
-// SharedMemoryTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/SharedMemoryTest.cpp#2 $
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "SharedMemoryTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/SharedMemory.h"
-#include "Poco/Path.h"
-#include "Poco/File.h"
-#include "Poco/Exception.h"
-
-
-using Poco::SharedMemory;
-
-
-SharedMemoryTest::SharedMemoryTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-SharedMemoryTest::~SharedMemoryTest()
-{
-}
-
-
-void SharedMemoryTest::testCreate()
-{
-	SharedMemory mem("hi", 4096, SharedMemory::AM_WRITE);
-	assert (mem.end()-mem.begin() == 4096);
-	mem.begin()[0] = 'A';
-	mem.end()[-1] = 'Z';
-}
-
-
-void SharedMemoryTest::testCreateFromFile()
-{
-	Poco::Path p = findDataFile("testdata.txt");
-	Poco::File f(p);
-	assert (f.exists() && f.isFile());
-	SharedMemory mem(f, SharedMemory::AM_READ);
-	assert (mem.end() > mem.begin()); // valid?
-	assert (mem.end() - mem.begin() == f.getSize());
-	assert (mem.begin()[0] == 'A');
-	assert (mem.end()[-5] == 'Z');
-}
-
-
-Poco::Path SharedMemoryTest::findDataFile(const std::string& afile)
-{
-	Poco::Path root;
-	root.makeAbsolute();
-	Poco::Path result;
-	while (!Poco::Path::find(root.toString(), "data", result))
-	{
-		root.makeParent();
-		if (root.toString().empty() || root.toString() == "/")
-			throw Poco::FileNotFoundException("Didn't find data subdir");
-	}
-	result.makeDirectory();
-	result.setFileName(afile);
-	Poco::File aFile(result.toString());
-	if (!aFile.exists() || (aFile.exists() && !aFile.isFile()))
-		throw Poco::FileNotFoundException("Didn't find file " + afile);
-	
-	return result;
-}
-
-
-void SharedMemoryTest::setUp()
-{
-}
-
-
-void SharedMemoryTest::tearDown()
-{
-}
-
-
-CppUnit::Test* SharedMemoryTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SharedMemoryTest");
-
-	CppUnit_addTest(pSuite, SharedMemoryTest, testCreate);
-	CppUnit_addTest(pSuite, SharedMemoryTest, testCreateFromFile);
-
-	return pSuite;
-}
+//
+// SharedMemoryTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/SharedMemoryTest.cpp#2 $
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "SharedMemoryTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/SharedMemory.h"
+#include "Poco/Path.h"
+#include "Poco/File.h"
+#include "Poco/Exception.h"
+
+
+using Poco::SharedMemory;
+
+
+SharedMemoryTest::SharedMemoryTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+SharedMemoryTest::~SharedMemoryTest()
+{
+}
+
+
+void SharedMemoryTest::testCreate()
+{
+	SharedMemory mem("hi", 4096, SharedMemory::AM_WRITE);
+	assert (mem.end()-mem.begin() == 4096);
+	mem.begin()[0] = 'A';
+	mem.end()[-1] = 'Z';
+}
+
+
+void SharedMemoryTest::testCreateFromFile()
+{
+	Poco::Path p = findDataFile("testdata.txt");
+	Poco::File f(p);
+	assert (f.exists() && f.isFile());
+	SharedMemory mem(f, SharedMemory::AM_READ);
+	assert (mem.end() > mem.begin()); // valid?
+	assert (mem.end() - mem.begin() == f.getSize());
+	assert (mem.begin()[0] == 'A');
+	assert (mem.end()[-5] == 'Z');
+}
+
+
+Poco::Path SharedMemoryTest::findDataFile(const std::string& afile)
+{
+	Poco::Path root;
+	root.makeAbsolute();
+	Poco::Path result;
+	while (!Poco::Path::find(root.toString(), "data", result))
+	{
+		root.makeParent();
+		if (root.toString().empty() || root.toString() == "/")
+			throw Poco::FileNotFoundException("Didn't find data subdir");
+	}
+	result.makeDirectory();
+	result.setFileName(afile);
+	Poco::File aFile(result.toString());
+	if (!aFile.exists() || (aFile.exists() && !aFile.isFile()))
+		throw Poco::FileNotFoundException("Didn't find file " + afile);
+	
+	return result;
+}
+
+
+void SharedMemoryTest::setUp()
+{
+}
+
+
+void SharedMemoryTest::tearDown()
+{
+}
+
+
+CppUnit::Test* SharedMemoryTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SharedMemoryTest");
+
+	CppUnit_addTest(pSuite, SharedMemoryTest, testCreate);
+	CppUnit_addTest(pSuite, SharedMemoryTest, testCreateFromFile);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/SharedMemoryTest.h b/Foundation/testsuite/src/SharedMemoryTest.h
index 5fb9c7a2d..af5bfaac8 100644
--- a/Foundation/testsuite/src/SharedMemoryTest.h
+++ b/Foundation/testsuite/src/SharedMemoryTest.h
@@ -1,64 +1,64 @@
-//
-// SharedMemoryTest.h
-//
-// $Id: //poco/Main/template/test.h#7 $
-//
-// Definition of the SharedMemoryTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef SharedMemoryTest_INCLUDED
-#define SharedMemoryTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "Poco/Path.h"
-#include "CppUnit/TestCase.h"
-
-
-class SharedMemoryTest: public CppUnit::TestCase
-{
-public:
-	SharedMemoryTest(const std::string& name);
-	~SharedMemoryTest();
-
-	void testCreate();
-	void testCreateFromFile();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-	static Poco::Path findDataFile(const std::string& afile);
-
-private:
-};
-
-
-#endif // SharedMemoryTest_INCLUDED
+//
+// SharedMemoryTest.h
+//
+// $Id: //poco/Main/template/test.h#7 $
+//
+// Definition of the SharedMemoryTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef SharedMemoryTest_INCLUDED
+#define SharedMemoryTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "Poco/Path.h"
+#include "CppUnit/TestCase.h"
+
+
+class SharedMemoryTest: public CppUnit::TestCase
+{
+public:
+	SharedMemoryTest(const std::string& name);
+	~SharedMemoryTest();
+
+	void testCreate();
+	void testCreateFromFile();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+	static Poco::Path findDataFile(const std::string& afile);
+
+private:
+};
+
+
+#endif // SharedMemoryTest_INCLUDED
diff --git a/Foundation/testsuite/src/SimpleHashTableTest.cpp b/Foundation/testsuite/src/SimpleHashTableTest.cpp
index 38da94d88..51483f1fe 100644
--- a/Foundation/testsuite/src/SimpleHashTableTest.cpp
+++ b/Foundation/testsuite/src/SimpleHashTableTest.cpp
@@ -1,177 +1,177 @@
-//
-// SimpleHashTableTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/SimpleHashTableTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "SimpleHashTableTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/SimpleHashTable.h"
-#include "Poco/NumberFormatter.h"
-
-
-using namespace Poco;
-
-
-SimpleHashTableTest::SimpleHashTableTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-SimpleHashTableTest::~SimpleHashTableTest()
-{
-}
-
-
-void SimpleHashTableTest::testInsert()
-{
-	std::string s1("str1");
-	std::string s2("str2");
-	SimpleHashTable<std::string, int> hashTable;
-	assert (!hashTable.exists(s1));
-	hashTable.insert(s1, 13);
-	assert (hashTable.exists(s1));
-	assert (hashTable.get(s1) == 13);
-	int retVal = 0;
-
-	assert (hashTable.get(s1, retVal));
-	assert (retVal == 13);
-	try
-	{
-		hashTable.insert(s1, 22);
-		failmsg ("duplicate insert must fail");
-	}
-	catch (Exception&){}
-	try
-	{
-		hashTable.get(s2);
-		failmsg ("getting a non inserted item must fail");
-	}
-	catch (Exception&){}
-
-	assert (!hashTable.exists(s2));
-	hashTable.insert(s2, 13);
-	assert (hashTable.exists(s2));
-}
-
-
-void SimpleHashTableTest::testUpdate()
-{
-	// add code for second test here
-	std::string s1("str1");
-	std::string s2("str2");
-	SimpleHashTable<std::string, int> hashTable;
-	hashTable.insert(s1, 13);
-	hashTable.update(s1, 14);
-	assert (hashTable.exists(s1));
-	assert (hashTable.get(s1) == 14);
-	int retVal = 0;
-
-	assert (hashTable.get(s1, retVal));
-	assert (retVal == 14);
-
-	// updating a non existing item must work too
-	hashTable.update(s2, 15);
-	assert (hashTable.get(s2) == 15);
-}
-
-
-void SimpleHashTableTest::testOverflow()
-{
-	SimpleHashTable<std::string, int> hashTable(31);
-	for (int i = 0; i < 31; ++i)
-	{
-		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
-	}
-
-	for (int i = 0; i < 31; ++i)
-	{
-		std::string tmp = Poco::NumberFormatter::format(i);
-		assert (hashTable.exists(tmp));
-		assert (hashTable.get(tmp) == i*i);
-	}
-}
-
-
-void SimpleHashTableTest::testSize()
-{
-	SimpleHashTable<std::string, int> hashTable(13);
-	assert (hashTable.size() == 0);
-	Poco::UInt32 h1 = hashTable.insert("1", 1);
-	assert (hashTable.size() == 1);
-	Poco::UInt32 h2 = hashTable.update("2", 2);
-	assert (hashTable.size() == 2);
-	hashTable.clear();
-	assert (hashTable.size() == 0);
-}
-
-
-void SimpleHashTableTest::testResize()
-{
-	SimpleHashTable<std::string, int> hashTable(13);
-	assert (hashTable.size() == 0);
-	hashTable.resize(2467);
-	for (int i = 0; i < 1024; ++i)
-	{
-		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
-	}
-	hashTable.resize(3037);
-
-	for (int i = 0; i < 1024; ++i)
-	{
-		std::string tmp = Poco::NumberFormatter::format(i);
-		assert (hashTable.exists(tmp));
-		assert (hashTable.get(tmp) == i*i);
-	}
-}
-
-
-void SimpleHashTableTest::setUp()
-{
-}
-
-
-void SimpleHashTableTest::tearDown()
-{
-}
-
-
-CppUnit::Test* SimpleHashTableTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SimpleHashTableTest");
-
-	CppUnit_addTest(pSuite, SimpleHashTableTest, testInsert);
-	CppUnit_addTest(pSuite, SimpleHashTableTest, testUpdate);
-	CppUnit_addTest(pSuite, SimpleHashTableTest, testOverflow);
-	CppUnit_addTest(pSuite, SimpleHashTableTest, testSize);
-	CppUnit_addTest(pSuite, SimpleHashTableTest, testResize);
-
-	return pSuite;
-}
+//
+// SimpleHashTableTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/SimpleHashTableTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "SimpleHashTableTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/SimpleHashTable.h"
+#include "Poco/NumberFormatter.h"
+
+
+using namespace Poco;
+
+
+SimpleHashTableTest::SimpleHashTableTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+SimpleHashTableTest::~SimpleHashTableTest()
+{
+}
+
+
+void SimpleHashTableTest::testInsert()
+{
+	std::string s1("str1");
+	std::string s2("str2");
+	SimpleHashTable<std::string, int> hashTable;
+	assert (!hashTable.exists(s1));
+	hashTable.insert(s1, 13);
+	assert (hashTable.exists(s1));
+	assert (hashTable.get(s1) == 13);
+	int retVal = 0;
+
+	assert (hashTable.get(s1, retVal));
+	assert (retVal == 13);
+	try
+	{
+		hashTable.insert(s1, 22);
+		failmsg ("duplicate insert must fail");
+	}
+	catch (Exception&){}
+	try
+	{
+		hashTable.get(s2);
+		failmsg ("getting a non inserted item must fail");
+	}
+	catch (Exception&){}
+
+	assert (!hashTable.exists(s2));
+	hashTable.insert(s2, 13);
+	assert (hashTable.exists(s2));
+}
+
+
+void SimpleHashTableTest::testUpdate()
+{
+	// add code for second test here
+	std::string s1("str1");
+	std::string s2("str2");
+	SimpleHashTable<std::string, int> hashTable;
+	hashTable.insert(s1, 13);
+	hashTable.update(s1, 14);
+	assert (hashTable.exists(s1));
+	assert (hashTable.get(s1) == 14);
+	int retVal = 0;
+
+	assert (hashTable.get(s1, retVal));
+	assert (retVal == 14);
+
+	// updating a non existing item must work too
+	hashTable.update(s2, 15);
+	assert (hashTable.get(s2) == 15);
+}
+
+
+void SimpleHashTableTest::testOverflow()
+{
+	SimpleHashTable<std::string, int> hashTable(31);
+	for (int i = 0; i < 31; ++i)
+	{
+		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
+	}
+
+	for (int i = 0; i < 31; ++i)
+	{
+		std::string tmp = Poco::NumberFormatter::format(i);
+		assert (hashTable.exists(tmp));
+		assert (hashTable.get(tmp) == i*i);
+	}
+}
+
+
+void SimpleHashTableTest::testSize()
+{
+	SimpleHashTable<std::string, int> hashTable(13);
+	assert (hashTable.size() == 0);
+	Poco::UInt32 h1 = hashTable.insert("1", 1);
+	assert (hashTable.size() == 1);
+	Poco::UInt32 h2 = hashTable.update("2", 2);
+	assert (hashTable.size() == 2);
+	hashTable.clear();
+	assert (hashTable.size() == 0);
+}
+
+
+void SimpleHashTableTest::testResize()
+{
+	SimpleHashTable<std::string, int> hashTable(13);
+	assert (hashTable.size() == 0);
+	hashTable.resize(2467);
+	for (int i = 0; i < 1024; ++i)
+	{
+		hashTable.insert(Poco::NumberFormatter::format(i), i*i);
+	}
+	hashTable.resize(3037);
+
+	for (int i = 0; i < 1024; ++i)
+	{
+		std::string tmp = Poco::NumberFormatter::format(i);
+		assert (hashTable.exists(tmp));
+		assert (hashTable.get(tmp) == i*i);
+	}
+}
+
+
+void SimpleHashTableTest::setUp()
+{
+}
+
+
+void SimpleHashTableTest::tearDown()
+{
+}
+
+
+CppUnit::Test* SimpleHashTableTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SimpleHashTableTest");
+
+	CppUnit_addTest(pSuite, SimpleHashTableTest, testInsert);
+	CppUnit_addTest(pSuite, SimpleHashTableTest, testUpdate);
+	CppUnit_addTest(pSuite, SimpleHashTableTest, testOverflow);
+	CppUnit_addTest(pSuite, SimpleHashTableTest, testSize);
+	CppUnit_addTest(pSuite, SimpleHashTableTest, testResize);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/SimpleHashTableTest.h b/Foundation/testsuite/src/SimpleHashTableTest.h
index bfa8a1bc6..bfd9d761c 100644
--- a/Foundation/testsuite/src/SimpleHashTableTest.h
+++ b/Foundation/testsuite/src/SimpleHashTableTest.h
@@ -1,65 +1,65 @@
-//
-// SimpleHashTableTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/SimpleHashTableTest.h#2 $
-//
-// Definition of the SimpleHashTableTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef SimpleHashTableTest_INCLUDED
-#define SimpleHashTableTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class SimpleHashTableTest: public CppUnit::TestCase
-{
-public:
-	SimpleHashTableTest(const std::string& name);
-	~SimpleHashTableTest();
-
-	void testInsert();
-	void testOverflow();
-	void testUpdate();
-	void testSize();
-	void testResize();
-	void testStatistic();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // SimpleHashTableTest_INCLUDED
+//
+// SimpleHashTableTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/SimpleHashTableTest.h#2 $
+//
+// Definition of the SimpleHashTableTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef SimpleHashTableTest_INCLUDED
+#define SimpleHashTableTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class SimpleHashTableTest: public CppUnit::TestCase
+{
+public:
+	SimpleHashTableTest(const std::string& name);
+	~SimpleHashTableTest();
+
+	void testInsert();
+	void testOverflow();
+	void testUpdate();
+	void testSize();
+	void testResize();
+	void testStatistic();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // SimpleHashTableTest_INCLUDED
diff --git a/Foundation/testsuite/src/TextEncodingTest.cpp b/Foundation/testsuite/src/TextEncodingTest.cpp
index ac2ff1c59..5b22ee739 100644
--- a/Foundation/testsuite/src/TextEncodingTest.cpp
+++ b/Foundation/testsuite/src/TextEncodingTest.cpp
@@ -1,89 +1,89 @@
-//
-// TextEncodingTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/TextEncodingTest.cpp#2 $
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "TextEncodingTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/TextEncoding.h"
-#include "Poco/Latin1Encoding.h"
-
-
-using Poco::TextEncoding;
-using Poco::Latin1Encoding;
-
-
-TextEncodingTest::TextEncodingTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-TextEncodingTest::~TextEncodingTest()
-{
-}
-
-
-void TextEncodingTest::testTextEncoding()
-{
-	TextEncoding& utf8 = TextEncoding::byName("utf8");
-	assert (std::string("UTF-8") == utf8.canonicalName());
-	
-	TextEncoding& latin1 = TextEncoding::byName("latin1");
-	assert (std::string("ISO-8859-1") == latin1.canonicalName());
-	
-	TextEncoding& glob = TextEncoding::global();
-	assert (std::string("UTF-8") == glob.canonicalName());
-	
-	TextEncoding::global(new Latin1Encoding);
-
-	TextEncoding& glob2 = TextEncoding::global();
-	assert (std::string("ISO-8859-1") == glob2.canonicalName());
-}
-
-
-void TextEncodingTest::setUp()
-{
-}
-
-
-void TextEncodingTest::tearDown()
-{
-}
-
-
-CppUnit::Test* TextEncodingTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("TextEncodingTest");
-
-	CppUnit_addTest(pSuite, TextEncodingTest, testTextEncoding);
-
-	return pSuite;
-}
+//
+// TextEncodingTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/TextEncodingTest.cpp#2 $
+//
+// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "TextEncodingTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/TextEncoding.h"
+#include "Poco/Latin1Encoding.h"
+
+
+using Poco::TextEncoding;
+using Poco::Latin1Encoding;
+
+
+TextEncodingTest::TextEncodingTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+TextEncodingTest::~TextEncodingTest()
+{
+}
+
+
+void TextEncodingTest::testTextEncoding()
+{
+	TextEncoding& utf8 = TextEncoding::byName("utf8");
+	assert (std::string("UTF-8") == utf8.canonicalName());
+	
+	TextEncoding& latin1 = TextEncoding::byName("latin1");
+	assert (std::string("ISO-8859-1") == latin1.canonicalName());
+	
+	TextEncoding& glob = TextEncoding::global();
+	assert (std::string("UTF-8") == glob.canonicalName());
+	
+	TextEncoding::global(new Latin1Encoding);
+
+	TextEncoding& glob2 = TextEncoding::global();
+	assert (std::string("ISO-8859-1") == glob2.canonicalName());
+}
+
+
+void TextEncodingTest::setUp()
+{
+}
+
+
+void TextEncodingTest::tearDown()
+{
+}
+
+
+CppUnit::Test* TextEncodingTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("TextEncodingTest");
+
+	CppUnit_addTest(pSuite, TextEncodingTest, testTextEncoding);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/TextEncodingTest.h b/Foundation/testsuite/src/TextEncodingTest.h
index 9757c056c..48c2605cd 100644
--- a/Foundation/testsuite/src/TextEncodingTest.h
+++ b/Foundation/testsuite/src/TextEncodingTest.h
@@ -1,60 +1,60 @@
-//
-// TextEncodingTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/TextEncodingTest.h#2 $
-//
-// Definition of the TextEncodingTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef TextEncodingTest_INCLUDED
-#define TextEncodingTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class TextEncodingTest: public CppUnit::TestCase
-{
-public:
-	TextEncodingTest(const std::string& name);
-	~TextEncodingTest();
-
-	void testTextEncoding();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // TextEncodingTest_INCLUDED
+//
+// TextEncodingTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/TextEncodingTest.h#2 $
+//
+// Definition of the TextEncodingTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef TextEncodingTest_INCLUDED
+#define TextEncodingTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class TextEncodingTest: public CppUnit::TestCase
+{
+public:
+	TextEncodingTest(const std::string& name);
+	~TextEncodingTest();
+
+	void testTextEncoding();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // TextEncodingTest_INCLUDED
diff --git a/Foundation/testsuite/src/TuplesTest.cpp b/Foundation/testsuite/src/TuplesTest.cpp
index ec965c19c..4c0ff38e2 100644
--- a/Foundation/testsuite/src/TuplesTest.cpp
+++ b/Foundation/testsuite/src/TuplesTest.cpp
@@ -1,607 +1,607 @@
-//
-// TuplesTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/TuplesTest.cpp#3 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "TuplesTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Tuple.h"
-#include "Poco/Void.h"
-#include <algorithm>
-#include <map>
-
-
-using Poco::TypeList;
-using Poco::NullTypeList;
-using Poco::TypeListType;
-using Poco::TypeGetter;
-using Poco::TypeLocator;
-using Poco::TypeAppender;
-using Poco::TypeOneEraser;
-using Poco::TypeAllEraser;
-using Poco::TypeDuplicateEraser;
-using Poco::TypeOneReplacer;
-using Poco::TypeAllReplacer;
-using Poco::Tuple;
-using Poco::Void;
-using Poco::Int8;
-using Poco::UInt8;
-using Poco::Int16;
-using Poco::UInt16;
-using Poco::Int32;
-using Poco::UInt32;
-using Poco::Int8;
-using Poco::UInt8;
-using Poco::Int16;
-using Poco::UInt16;
-using Poco::Int32;
-using Poco::UInt32;
-
-
-TuplesTest::TuplesTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-TuplesTest::~TuplesTest()
-{
-}
-
-
-void TuplesTest::testTuple1()
-{
-	Tuple<int> t;
-	assert (t.length == 1);
-	t.set<0>(-1);
-	assert (t.get<0>() == -1);
-	
-	Tuple<int> t2(-1);
-	assert (t2.get<0>() == -1);
-
-	Tuple<int> tCpy (t2);
-	assert (t2.get<0>() == tCpy.get<0>());
-	assert (t2 == tCpy);
-
-	Tuple<int> tCpy2 = t2;
-	assert (t2.get<0>() == tCpy2.get<0>());
-	assert (t2 == tCpy2);
-	tCpy2.set<0>(888);
-	assert (t2 != tCpy2);
-	assert (t < tCpy2);
-
-	Tuple<int, std::string> t3(0);
-	assert (t3.get<1>().empty());
-
-	Tuple<int, std::string, std::vector<std::string> > t4(0);
-	assert (t4.get<1>().empty());
-	assert (t4.get<2>().empty());
-}
-
-
-void TuplesTest::testTuple2()
-{
-	Tuple<int, Void> dummy1;
-	assert (dummy1.length == 2);
-	dummy1.set<0>(-1);
-	assert (dummy1.get<0>() == -1);
-	//test partial init
-	Tuple<int, Void> dummy11(0);
-
-	Tuple<Void, int> dummy2;
-	dummy2.set<1>(-1);
-	assert (dummy2.get<1>() == -1);
-
-	Tuple<Void, int> dummy3;
-	dummy3.set<1>(-1);
-	assert (dummy3.get<1>() == -1);
-
-	Tuple<std::string, int> aTuple;
-	aTuple.set<0>("str");
-	aTuple.set<1>(1);
-	assert (aTuple.get<0>() == "str");
-	assert (aTuple.get<1>() == 1);
-
-	Tuple<std::string, int> aTuple2(aTuple);
-	assert (aTuple == aTuple2);
-	aTuple2.set<1>(99);
-	assert (aTuple != aTuple2);
-	aTuple2.set<1>(100000);
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple3()
-{
-	Tuple<int, Void, Void> dummy1;
-	assert (dummy1.length == 3);
-	dummy1.set<0>(-1);
-	assert (dummy1.get<0>() == -1);
-	//test partial init
-	Tuple<int, Void, Void> dummy11(0);
-
-	Tuple<Void, int, Void> dummy2;
-	dummy2.set<1>(-1);
-	assert (dummy2.get<1>() == -1);
-
-	Tuple<Void, Void, int> dummy3;
-	dummy3.set<2>(-1);
-	assert (dummy3.get<2>() == -1);
-
-	Tuple<std::string, int, bool> aTuple;
-	aTuple.set<0>("str");
-	aTuple.set<1>(1);
-	aTuple.set<2>(true);
-	assert (aTuple.get<0>() == "str");
-	assert (aTuple.get<1>() == 1);
-	assert (aTuple.get<2>());
-
-	Tuple<std::string, int, bool> aTuple2(aTuple);
-	assert (aTuple == aTuple2);
-	aTuple2.set<2>(false);
-	assert (aTuple != aTuple2);
-	aTuple2.set<1>(100000);
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple4()
-{
-	Tuple<int, Void, Void, Void> dummy1;
-	assert (dummy1.length == 4);
-	dummy1.set<0>(-1);
-	assert (dummy1.get<0>() == -1);
-	//test partial init
-	Tuple<int, Void, Void, Void> dummy11(0);
-
-	Tuple<Void, int, Void, Void> dummy2;
-	dummy2.set<1>(-1);
-	assert (dummy2.get<1>() == -1);
-
-	Tuple<Void, Void, Void, int> dummy3;
-	dummy3.set<3>(-1);
-	assert (dummy3.get<3>() == -1);
-
-	Tuple<std::string, int, bool, float> aTuple;
-	aTuple.set<0>("str");
-	aTuple.set<1>(1);
-	aTuple.set<2>(true);
-	aTuple.set<3>(3.14f);
-	assert (aTuple.get<0>() == "str");
-	assert (aTuple.get<1>() == 1);
-	assert (aTuple.get<2>());
-	assert (aTuple.get<3>() >= 3.13f && aTuple.get<3>() <= 3.15f);
-
-	Tuple<std::string, int, bool, float> aTuple2(aTuple);
-	assert (aTuple == aTuple2);
-	aTuple2.set<2>(false);
-	assert (aTuple != aTuple2);
-	aTuple2.set<1>(100000);
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple5()
-{
-	Tuple<int, Void, Void, Void, Void> dummy1;
-	assert (dummy1.length == 5);
-	dummy1.set<0>(-1);
-	assert (dummy1.get<0>() == -1);
-	//test partial init
-	Tuple<int, Void, Void, Void, Void> dummy11(0);
-
-	Tuple<Void, int, Void, Void, Void> dummy2;
-	dummy2.set<1>(-1);
-	assert (dummy2.get<1>() == -1);
-
-	Tuple<Void, Void, Void, Void, int> dummy3;
-	dummy3.set<4>(-1);
-	assert (dummy3.get<4>() == -1);
-
-	Tuple<std::string, int, bool, float, char> aTuple;
-	aTuple.set<0>("str");
-	aTuple.set<1>(1);
-	aTuple.set<2>(true);
-	aTuple.set<3>(3.14f);
-	aTuple.set<4>(' ');
-	assert (aTuple.get<0>() == "str");
-	assert (aTuple.get<1>() == 1);
-	assert (aTuple.get<2>());
-	assert (aTuple.get<3>() >= 3.13f && aTuple.get<3>() <= 3.15f);
-	assert (aTuple.get<4>() == ' ');
-
-	Tuple<std::string, int, bool, float, char> aTuple2(aTuple);
-	assert (aTuple == aTuple2);
-	aTuple2.set<2>(false);
-	assert (aTuple != aTuple2);
-	aTuple2.set<1>(100000);
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple6()
-{
-	Tuple<std::string, int, bool, float, char, long> aTuple;
-	assert (aTuple.length == 6);
-	Tuple<std::string, int, bool, float, char, long> 
-		aTuple2("1", 1, true, 3.14f, 'c', 999);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple7()
-{
-	Tuple<std::string, int, bool, float, char, long, double> aTuple;
-	assert (aTuple.length == 7);
-	Tuple<std::string, int, bool, float, char, long, double> 
-		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple8()
-{
-	Tuple<std::string, int, bool, float, char, long, double, short> aTuple;
-	assert (aTuple.length == 8);
-	Tuple<std::string, int, bool, float, char, long, double, short> 
-		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-void TuplesTest::testTuple9()
-{
-	Tuple<std::string, int, bool, float, char, long, double, short, std::string> aTuple;
-	assert (aTuple.length == 9);
-	Tuple<std::string, int, bool, float, char, long, double, short, std::string> 
-		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2");
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple10()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 10);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple11()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 11);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1");
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple12()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 12);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple13()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 13);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple14()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 14);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple15()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 15);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c');
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple16()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char, long> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 16);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple17()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char, long, double> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 17);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple18()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char, long, double, short> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 18);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple19()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char, long, double, short, std::string> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 19);
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2");
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTuple20()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 20);
-	
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-}
-
-
-void TuplesTest::testTupleOrder()
-{
-	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
-		std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
-
-	TupleType aTuple;
-	assert (aTuple.length == 20);
-	
-	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
-	assert (aTuple != aTuple2);
-	aTuple = aTuple2;
-	assert (aTuple == aTuple2);
-	aTuple2.get<1>()++;
-	assert (aTuple < aTuple2);
-
-	TupleType aTuple3;
-	aTuple3 = aTuple2;
-	aTuple3.get<1>()++;
-	assert (aTuple2 < aTuple3);
-
-	testTupleStrictWeak(aTuple, aTuple2, aTuple3);
-
-	std::vector<TupleType> tv;
-	tv.push_back(aTuple3);
-	tv.push_back(aTuple);
-	tv.push_back(aTuple2);
-
-	assert (tv[0] == aTuple3);
-	assert (tv[1] == aTuple);
-	assert (tv[2] == aTuple2);
-
-	std::sort(tv.begin(), tv.end());
-	
-	assert (tv[0] == aTuple);
-	assert (tv[1] == aTuple2);
-	assert (tv[2] == aTuple3);
-
-	std::map<TupleType, int> tm;
-	std::pair<std::map<TupleType, int>::iterator, bool> mIt = tm.insert(std::map<TupleType, int>::value_type(aTuple2, 2));
-	assert (mIt.second);
-	mIt = tm.insert(std::map<TupleType, int>::value_type(aTuple, 1));
-	assert (mIt.second);
-	mIt = tm.insert(std::map<TupleType, int>::value_type(aTuple3, 3));
-	assert (mIt.second);
-
-	std::map<TupleType, int>::iterator fIt = tm.find(aTuple2);
-	assert (2 == fIt->second);
-
-	typedef Tuple<std::string, std::string, std::string, std::string> StrTup;
-	typedef std::map<StrTup, int> StrTupMap;
-
-	StrTup st1("123", "456", "789", "101112");
-	StrTup st2("123", "456", "101112", "789");
-	StrTup st3("123", "789", "789", "101112");
-	StrTup st4("123", "101112", "456", "789");
-
-	testTupleStrictWeak(st2, st1, st3);
-
-	StrTupMap strMap;
-	strMap.insert(StrTupMap::value_type(st1, 1));
-	strMap.insert(StrTupMap::value_type(st2, 2));
-	strMap.insert(StrTupMap::value_type(st3, 3));
-	strMap.insert(StrTupMap::value_type(st4, 4));
-
-	assert (1 == strMap[st1]);
-	assert (2 == strMap[st2]);
-	assert (3 == strMap[st3]);
-	assert (4 == strMap[st4]);
-
-	StrTupMap::iterator it = strMap.begin();
-	assert (st4 == it->first); ++it;
-	assert (st2 == it->first); ++it;
-	assert (st1 == it->first); ++it;
-	assert (st3 == it->first); ++it;
-	assert (it == strMap.end());
-}
-
-
-void TuplesTest::testMemOverhead()
-{
-	Tuple<short> small(0);
-	int sz = sizeof(small);
-	assert (sz == 4 || sz == 8); //depending on architecture and alignment
-	Tuple<long> notSoSmall(0);
-	sz = sizeof(notSoSmall);
-	assert (sz == 8 || sz == 16); //depending on architecture and alignment
-}
-
-
-void TuplesTest::setUp()
-{
-}
-
-
-void TuplesTest::tearDown()
-{
-}
-
-
-CppUnit::Test* TuplesTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("TuplesTest");
-
-	CppUnit_addTest(pSuite, TuplesTest, testTuple1);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple2);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple3);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple4);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple5);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple6);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple7);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple8);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple9);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple10);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple11);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple12);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple13);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple14);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple15);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple16);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple17);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple18);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple19);
-	CppUnit_addTest(pSuite, TuplesTest, testTuple20);
-	CppUnit_addTest(pSuite, TuplesTest, testTupleOrder);
-	CppUnit_addTest(pSuite, TuplesTest, testMemOverhead);
-
-	return pSuite;
-}
+//
+// TuplesTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/TuplesTest.cpp#3 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "TuplesTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Tuple.h"
+#include "Poco/Void.h"
+#include <algorithm>
+#include <map>
+
+
+using Poco::TypeList;
+using Poco::NullTypeList;
+using Poco::TypeListType;
+using Poco::TypeGetter;
+using Poco::TypeLocator;
+using Poco::TypeAppender;
+using Poco::TypeOneEraser;
+using Poco::TypeAllEraser;
+using Poco::TypeDuplicateEraser;
+using Poco::TypeOneReplacer;
+using Poco::TypeAllReplacer;
+using Poco::Tuple;
+using Poco::Void;
+using Poco::Int8;
+using Poco::UInt8;
+using Poco::Int16;
+using Poco::UInt16;
+using Poco::Int32;
+using Poco::UInt32;
+using Poco::Int8;
+using Poco::UInt8;
+using Poco::Int16;
+using Poco::UInt16;
+using Poco::Int32;
+using Poco::UInt32;
+
+
+TuplesTest::TuplesTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+TuplesTest::~TuplesTest()
+{
+}
+
+
+void TuplesTest::testTuple1()
+{
+	Tuple<int> t;
+	assert (t.length == 1);
+	t.set<0>(-1);
+	assert (t.get<0>() == -1);
+	
+	Tuple<int> t2(-1);
+	assert (t2.get<0>() == -1);
+
+	Tuple<int> tCpy (t2);
+	assert (t2.get<0>() == tCpy.get<0>());
+	assert (t2 == tCpy);
+
+	Tuple<int> tCpy2 = t2;
+	assert (t2.get<0>() == tCpy2.get<0>());
+	assert (t2 == tCpy2);
+	tCpy2.set<0>(888);
+	assert (t2 != tCpy2);
+	assert (t < tCpy2);
+
+	Tuple<int, std::string> t3(0);
+	assert (t3.get<1>().empty());
+
+	Tuple<int, std::string, std::vector<std::string> > t4(0);
+	assert (t4.get<1>().empty());
+	assert (t4.get<2>().empty());
+}
+
+
+void TuplesTest::testTuple2()
+{
+	Tuple<int, Void> dummy1;
+	assert (dummy1.length == 2);
+	dummy1.set<0>(-1);
+	assert (dummy1.get<0>() == -1);
+	//test partial init
+	Tuple<int, Void> dummy11(0);
+
+	Tuple<Void, int> dummy2;
+	dummy2.set<1>(-1);
+	assert (dummy2.get<1>() == -1);
+
+	Tuple<Void, int> dummy3;
+	dummy3.set<1>(-1);
+	assert (dummy3.get<1>() == -1);
+
+	Tuple<std::string, int> aTuple;
+	aTuple.set<0>("str");
+	aTuple.set<1>(1);
+	assert (aTuple.get<0>() == "str");
+	assert (aTuple.get<1>() == 1);
+
+	Tuple<std::string, int> aTuple2(aTuple);
+	assert (aTuple == aTuple2);
+	aTuple2.set<1>(99);
+	assert (aTuple != aTuple2);
+	aTuple2.set<1>(100000);
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple3()
+{
+	Tuple<int, Void, Void> dummy1;
+	assert (dummy1.length == 3);
+	dummy1.set<0>(-1);
+	assert (dummy1.get<0>() == -1);
+	//test partial init
+	Tuple<int, Void, Void> dummy11(0);
+
+	Tuple<Void, int, Void> dummy2;
+	dummy2.set<1>(-1);
+	assert (dummy2.get<1>() == -1);
+
+	Tuple<Void, Void, int> dummy3;
+	dummy3.set<2>(-1);
+	assert (dummy3.get<2>() == -1);
+
+	Tuple<std::string, int, bool> aTuple;
+	aTuple.set<0>("str");
+	aTuple.set<1>(1);
+	aTuple.set<2>(true);
+	assert (aTuple.get<0>() == "str");
+	assert (aTuple.get<1>() == 1);
+	assert (aTuple.get<2>());
+
+	Tuple<std::string, int, bool> aTuple2(aTuple);
+	assert (aTuple == aTuple2);
+	aTuple2.set<2>(false);
+	assert (aTuple != aTuple2);
+	aTuple2.set<1>(100000);
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple4()
+{
+	Tuple<int, Void, Void, Void> dummy1;
+	assert (dummy1.length == 4);
+	dummy1.set<0>(-1);
+	assert (dummy1.get<0>() == -1);
+	//test partial init
+	Tuple<int, Void, Void, Void> dummy11(0);
+
+	Tuple<Void, int, Void, Void> dummy2;
+	dummy2.set<1>(-1);
+	assert (dummy2.get<1>() == -1);
+
+	Tuple<Void, Void, Void, int> dummy3;
+	dummy3.set<3>(-1);
+	assert (dummy3.get<3>() == -1);
+
+	Tuple<std::string, int, bool, float> aTuple;
+	aTuple.set<0>("str");
+	aTuple.set<1>(1);
+	aTuple.set<2>(true);
+	aTuple.set<3>(3.14f);
+	assert (aTuple.get<0>() == "str");
+	assert (aTuple.get<1>() == 1);
+	assert (aTuple.get<2>());
+	assert (aTuple.get<3>() >= 3.13f && aTuple.get<3>() <= 3.15f);
+
+	Tuple<std::string, int, bool, float> aTuple2(aTuple);
+	assert (aTuple == aTuple2);
+	aTuple2.set<2>(false);
+	assert (aTuple != aTuple2);
+	aTuple2.set<1>(100000);
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple5()
+{
+	Tuple<int, Void, Void, Void, Void> dummy1;
+	assert (dummy1.length == 5);
+	dummy1.set<0>(-1);
+	assert (dummy1.get<0>() == -1);
+	//test partial init
+	Tuple<int, Void, Void, Void, Void> dummy11(0);
+
+	Tuple<Void, int, Void, Void, Void> dummy2;
+	dummy2.set<1>(-1);
+	assert (dummy2.get<1>() == -1);
+
+	Tuple<Void, Void, Void, Void, int> dummy3;
+	dummy3.set<4>(-1);
+	assert (dummy3.get<4>() == -1);
+
+	Tuple<std::string, int, bool, float, char> aTuple;
+	aTuple.set<0>("str");
+	aTuple.set<1>(1);
+	aTuple.set<2>(true);
+	aTuple.set<3>(3.14f);
+	aTuple.set<4>(' ');
+	assert (aTuple.get<0>() == "str");
+	assert (aTuple.get<1>() == 1);
+	assert (aTuple.get<2>());
+	assert (aTuple.get<3>() >= 3.13f && aTuple.get<3>() <= 3.15f);
+	assert (aTuple.get<4>() == ' ');
+
+	Tuple<std::string, int, bool, float, char> aTuple2(aTuple);
+	assert (aTuple == aTuple2);
+	aTuple2.set<2>(false);
+	assert (aTuple != aTuple2);
+	aTuple2.set<1>(100000);
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple6()
+{
+	Tuple<std::string, int, bool, float, char, long> aTuple;
+	assert (aTuple.length == 6);
+	Tuple<std::string, int, bool, float, char, long> 
+		aTuple2("1", 1, true, 3.14f, 'c', 999);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple7()
+{
+	Tuple<std::string, int, bool, float, char, long, double> aTuple;
+	assert (aTuple.length == 7);
+	Tuple<std::string, int, bool, float, char, long, double> 
+		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple8()
+{
+	Tuple<std::string, int, bool, float, char, long, double, short> aTuple;
+	assert (aTuple.length == 8);
+	Tuple<std::string, int, bool, float, char, long, double, short> 
+		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+void TuplesTest::testTuple9()
+{
+	Tuple<std::string, int, bool, float, char, long, double, short, std::string> aTuple;
+	assert (aTuple.length == 9);
+	Tuple<std::string, int, bool, float, char, long, double, short, std::string> 
+		aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2");
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple10()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 10);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple11()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 11);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1");
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple12()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 12);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple13()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 13);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple14()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 14);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple15()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 15);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c');
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple16()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char, long> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 16);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple17()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char, long, double> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 17);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple18()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char, long, double, short> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 18);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple19()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char, long, double, short, std::string> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 19);
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2");
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTuple20()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 20);
+	
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+}
+
+
+void TuplesTest::testTupleOrder()
+{
+	typedef Tuple<std::string, int, bool, float, char, long, double, short, std::string, int, 
+		std::string, int, bool, float, char, long, double, short, std::string, int> TupleType;
+
+	TupleType aTuple;
+	assert (aTuple.length == 20);
+	
+	TupleType aTuple2("1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2, "1", 1, true, 3.14f, 'c', 999, 33.14, 32700, "2", 2);
+	assert (aTuple != aTuple2);
+	aTuple = aTuple2;
+	assert (aTuple == aTuple2);
+	aTuple2.get<1>()++;
+	assert (aTuple < aTuple2);
+
+	TupleType aTuple3;
+	aTuple3 = aTuple2;
+	aTuple3.get<1>()++;
+	assert (aTuple2 < aTuple3);
+
+	testTupleStrictWeak(aTuple, aTuple2, aTuple3);
+
+	std::vector<TupleType> tv;
+	tv.push_back(aTuple3);
+	tv.push_back(aTuple);
+	tv.push_back(aTuple2);
+
+	assert (tv[0] == aTuple3);
+	assert (tv[1] == aTuple);
+	assert (tv[2] == aTuple2);
+
+	std::sort(tv.begin(), tv.end());
+	
+	assert (tv[0] == aTuple);
+	assert (tv[1] == aTuple2);
+	assert (tv[2] == aTuple3);
+
+	std::map<TupleType, int> tm;
+	std::pair<std::map<TupleType, int>::iterator, bool> mIt = tm.insert(std::map<TupleType, int>::value_type(aTuple2, 2));
+	assert (mIt.second);
+	mIt = tm.insert(std::map<TupleType, int>::value_type(aTuple, 1));
+	assert (mIt.second);
+	mIt = tm.insert(std::map<TupleType, int>::value_type(aTuple3, 3));
+	assert (mIt.second);
+
+	std::map<TupleType, int>::iterator fIt = tm.find(aTuple2);
+	assert (2 == fIt->second);
+
+	typedef Tuple<std::string, std::string, std::string, std::string> StrTup;
+	typedef std::map<StrTup, int> StrTupMap;
+
+	StrTup st1("123", "456", "789", "101112");
+	StrTup st2("123", "456", "101112", "789");
+	StrTup st3("123", "789", "789", "101112");
+	StrTup st4("123", "101112", "456", "789");
+
+	testTupleStrictWeak(st2, st1, st3);
+
+	StrTupMap strMap;
+	strMap.insert(StrTupMap::value_type(st1, 1));
+	strMap.insert(StrTupMap::value_type(st2, 2));
+	strMap.insert(StrTupMap::value_type(st3, 3));
+	strMap.insert(StrTupMap::value_type(st4, 4));
+
+	assert (1 == strMap[st1]);
+	assert (2 == strMap[st2]);
+	assert (3 == strMap[st3]);
+	assert (4 == strMap[st4]);
+
+	StrTupMap::iterator it = strMap.begin();
+	assert (st4 == it->first); ++it;
+	assert (st2 == it->first); ++it;
+	assert (st1 == it->first); ++it;
+	assert (st3 == it->first); ++it;
+	assert (it == strMap.end());
+}
+
+
+void TuplesTest::testMemOverhead()
+{
+	Tuple<short> small(0);
+	int sz = sizeof(small);
+	assert (sz == 4 || sz == 8); //depending on architecture and alignment
+	Tuple<long> notSoSmall(0);
+	sz = sizeof(notSoSmall);
+	assert (sz == 8 || sz == 16); //depending on architecture and alignment
+}
+
+
+void TuplesTest::setUp()
+{
+}
+
+
+void TuplesTest::tearDown()
+{
+}
+
+
+CppUnit::Test* TuplesTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("TuplesTest");
+
+	CppUnit_addTest(pSuite, TuplesTest, testTuple1);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple2);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple3);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple4);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple5);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple6);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple7);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple8);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple9);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple10);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple11);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple12);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple13);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple14);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple15);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple16);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple17);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple18);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple19);
+	CppUnit_addTest(pSuite, TuplesTest, testTuple20);
+	CppUnit_addTest(pSuite, TuplesTest, testTupleOrder);
+	CppUnit_addTest(pSuite, TuplesTest, testMemOverhead);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/TuplesTest.h b/Foundation/testsuite/src/TuplesTest.h
index 001847c7c..1ad8f8a82 100644
--- a/Foundation/testsuite/src/TuplesTest.h
+++ b/Foundation/testsuite/src/TuplesTest.h
@@ -1,88 +1,88 @@
-//
-// TuplesTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/TuplesTest.h#2 $
-//
-// Definition of the TuplesTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef TuplesTest_INCLUDED
-#define TuplesTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class TuplesTest: public CppUnit::TestCase
-{
-public:
-	TuplesTest(const std::string& name);
-	~TuplesTest();
-
-	void testTuple1();
-	void testTuple2();
-	void testTuple3();
-	void testTuple4();
-	void testTuple5();
-	void testTuple6();
-	void testTuple7();
-	void testTuple8();
-	void testTuple9();
-	void testTuple10();
-	void testTuple11();
-	void testTuple12();
-	void testTuple13();
-	void testTuple14();
-	void testTuple15();
-	void testTuple16();
-	void testTuple17();
-	void testTuple18();
-	void testTuple19();
-	void testTuple20();
-	void testTupleOrder();
-	void testMemOverhead();
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-
-	template <class T>
-	void testTupleStrictWeak(const T& t1, const T& t2, const T& t3)
-	{
-		assert (t1 < t2 && !(t2 < t1)); // antisymmetric
-		assert (t1 < t2 && t2 < t3 && t1 < t3); // transitive
-		assert (!(t1 < t1)); // irreflexive
-	}
-};
-
-
-#endif // TuplesTest_INCLUDED
+//
+// TuplesTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/TuplesTest.h#2 $
+//
+// Definition of the TuplesTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef TuplesTest_INCLUDED
+#define TuplesTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class TuplesTest: public CppUnit::TestCase
+{
+public:
+	TuplesTest(const std::string& name);
+	~TuplesTest();
+
+	void testTuple1();
+	void testTuple2();
+	void testTuple3();
+	void testTuple4();
+	void testTuple5();
+	void testTuple6();
+	void testTuple7();
+	void testTuple8();
+	void testTuple9();
+	void testTuple10();
+	void testTuple11();
+	void testTuple12();
+	void testTuple13();
+	void testTuple14();
+	void testTuple15();
+	void testTuple16();
+	void testTuple17();
+	void testTuple18();
+	void testTuple19();
+	void testTuple20();
+	void testTupleOrder();
+	void testMemOverhead();
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+
+	template <class T>
+	void testTupleStrictWeak(const T& t1, const T& t2, const T& t3)
+	{
+		assert (t1 < t2 && !(t2 < t1)); // antisymmetric
+		assert (t1 < t2 && t2 < t3 && t1 < t3); // transitive
+		assert (!(t1 < t1)); // irreflexive
+	}
+};
+
+
+#endif // TuplesTest_INCLUDED
diff --git a/Foundation/testsuite/src/TypeListTest.cpp b/Foundation/testsuite/src/TypeListTest.cpp
index 72e40d6cc..7493f7fb6 100644
--- a/Foundation/testsuite/src/TypeListTest.cpp
+++ b/Foundation/testsuite/src/TypeListTest.cpp
@@ -1,323 +1,323 @@
-//
-// TypeListTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/TypeListTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "TypeListTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Tuple.h"
-#include "Poco/TypeList.h"
-#include "Poco/Void.h"
-#include <iostream>
-#if defined(_MSC_VER)
-#	pragma warning(disable:4800) // forcing value to bool 'true' or 'false' on MSVC 71
-#endif
-
-using Poco::TypeList;
-using Poco::Tuple;
-using Poco::NullTypeList;
-using Poco::TypeListType;
-using Poco::TypeGetter;
-using Poco::TypeLocator;
-using Poco::TypeAppender;
-using Poco::TypeOneEraser;
-using Poco::TypeAllEraser;
-using Poco::TypeDuplicateEraser;
-using Poco::TypeOneReplacer;
-using Poco::TypeAllReplacer;
-using Poco::Int8;
-using Poco::UInt8;
-using Poco::Int16;
-using Poco::UInt16;
-using Poco::Int32;
-using Poco::UInt32;
-using Poco::Int8;
-using Poco::UInt8;
-using Poco::Int16;
-using Poco::UInt16;
-using Poco::Int32;
-using Poco::UInt32;
-using Poco::Void;
-
-
-TypeListTest::TypeListTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-TypeListTest::~TypeListTest()
-{
-}
-
-
-void TypeListTest::testTypeList()
-{
-	typedef TypeListType<Int8,
-		UInt8,
-		Int16,
-		UInt16,
-		Int32,
-		UInt32,
-		float,
-		double,
-		Int8,
-		UInt8,
-		Int16,
-		UInt16,
-		Int32,
-		UInt32,
-		float>::HeadType Type15;
-
-	Tuple<TypeGetter<0, Type15>::HeadType,
-		TypeGetter<1, Type15>::HeadType,
-		TypeGetter<2, Type15>::HeadType,
-		TypeGetter<3, Type15>::HeadType,
-		TypeGetter<4, Type15>::HeadType,
-		TypeGetter<5, Type15>::HeadType,
-		TypeGetter<6, Type15>::HeadType,
-		TypeGetter<7, Type15>::HeadType,
-		TypeGetter<8, Type15>::HeadType,
-		TypeGetter<9, Type15>::HeadType> tuple;
-
-	static TypeLocator<Type15, Int8> pos0;
-	static TypeLocator<Type15, UInt8> pos1;
-	static TypeLocator<Type15, Int16> pos2;
-	static TypeLocator<Type15, UInt16> pos3;
-	static TypeLocator<Type15, Int32> pos4;
-	static TypeLocator<Type15, UInt32> pos5;
-	static TypeLocator<Type15, float> pos6;
-	static TypeLocator<Type15, double> pos7;
-	static TypeLocator<Type15, Int8> pos8;
-	static TypeLocator<Type15, std::string> posUnknown;
-
-	assert (pos0.value == 0);
-	assert (pos1.value == 1);
-	assert (pos2.value == 2);
-	assert (pos3.value == 3);
-	assert (pos4.value == 4);
-	assert (pos5.value == 5);
-	assert (pos6.value == 6);
-	assert (pos7.value == 7);
-	assert (pos8.value == 0);
-	assert (posUnknown.value == -1);
-
-	tuple.set<TypeLocator<Type15, Int32>::value >(-123);
-	assert (-123 == tuple.get<4>());
-
-	assert (typeid(TypeGetter<0, Type15>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<0, Type15>::ConstHeadType) == typeid(const Int8));
-	assert (typeid(TypeGetter<1, Type15>::HeadType) == typeid(UInt8));
-	assert (typeid(TypeGetter<1, Type15>::ConstHeadType) == typeid(const UInt8));
-	assert (typeid(TypeGetter<2, Type15>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<2, Type15>::ConstHeadType) == typeid(const Int16));
-	assert (typeid(TypeGetter<3, Type15>::HeadType) == typeid(UInt16));
-	assert (typeid(TypeGetter<3, Type15>::ConstHeadType) == typeid(const UInt16));
-	assert (typeid(TypeGetter<4, Type15>::HeadType) == typeid(Int32));
-	assert (typeid(TypeGetter<4, Type15>::ConstHeadType) == typeid(const Int32));
-	assert (typeid(TypeGetter<5, Type15>::HeadType) == typeid(UInt32));
-	assert (typeid(TypeGetter<5, Type15>::ConstHeadType) == typeid(const UInt32));
-	assert (typeid(TypeGetter<6, Type15>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<6, Type15>::ConstHeadType) == typeid(const float));
-	assert (typeid(TypeGetter<7, Type15>::HeadType) == typeid(double));
-	assert (typeid(TypeGetter<7, Type15>::ConstHeadType) == typeid(const double));
-	assert (typeid(TypeGetter<8, Type15>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<8, Type15>::ConstHeadType) == typeid(const Int8));
-	assert (typeid(TypeGetter<9, Type15>::HeadType) == typeid(UInt8));
-	assert (typeid(TypeGetter<9, Type15>::ConstHeadType) == typeid(const UInt8));
-	assert (typeid(TypeGetter<10, Type15>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<10, Type15>::ConstHeadType) == typeid(const Int16));
-	assert (typeid(TypeGetter<11, Type15>::HeadType) == typeid(UInt16));
-	assert (typeid(TypeGetter<11, Type15>::ConstHeadType) == typeid(const UInt16));
-	assert (typeid(TypeGetter<12, Type15>::HeadType) == typeid(Int32));
-	assert (typeid(TypeGetter<12, Type15>::ConstHeadType) == typeid(const Int32));
-	assert (typeid(TypeGetter<13, Type15>::HeadType) == typeid(UInt32));
-	assert (typeid(TypeGetter<13, Type15>::ConstHeadType) == typeid(const UInt32));
-	assert (typeid(TypeGetter<14, Type15>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<14, Type15>::ConstHeadType) == typeid(const float));
-
-	typedef TypeListType<Int8>::HeadType Type1;
-	assert (1 == Type1::length);
-	typedef TypeListType<Int16, Int32>::HeadType Type2;
-	assert (2 == Type2::length);
-	typedef TypeAppender<Type1, Type2>::HeadType Type3;
-	assert (3 == Type3::length);
-
-	assert (typeid(TypeGetter<0, Type3>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, Type3>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<2, Type3>::HeadType) == typeid(Int32));
-
-	static TypeLocator<Type3, Int8> posNo1;
-	static TypeLocator<Type3, Int16> posNo2;
-	static TypeLocator<Type3, Int32> posNo3;
-
-	assert (posNo1.value == 0);
-	assert (posNo2.value == 1);
-	assert (posNo3.value == 2);
-
-	typedef TypeOneEraser<Type3, Int8>::HeadType TypeEraser1;
-	assert (2 == TypeEraser1::length);
-	assert (typeid(TypeGetter<0, TypeEraser1>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<1, TypeEraser1>::HeadType) == typeid(Int32));
-
-	typedef TypeOneEraser<Type3, Int16>::HeadType TypeEraser2;
-	assert (2 == TypeEraser2::length);
-	assert (typeid(TypeGetter<0, TypeEraser2>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeEraser2>::HeadType) == typeid(Int32));
-
-	typedef TypeOneEraser<Type3, Int32>::HeadType TypeEraser3;
-	assert (2 == TypeEraser3::length);
-	assert (typeid(TypeGetter<0, TypeEraser3>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeEraser3>::HeadType) == typeid(Int16));
-
-	typedef TypeListType<Int8,Int16,Int8,Int16,Int8>::HeadType Type5;
-	typedef TypeAllEraser<Type5, Int8>::HeadType TypeAllEraser3;
-	assert (2 == TypeAllEraser3::length);
-	assert (typeid(TypeGetter<0, TypeAllEraser3>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<1, TypeAllEraser3>::HeadType) == typeid(Int16));
-
-	typedef TypeDuplicateEraser<Type5>::HeadType TypeDuplicateEraser1;
-	assert (2 == TypeDuplicateEraser1::length);
-	assert (typeid(TypeGetter<0, TypeDuplicateEraser1>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeDuplicateEraser1>::HeadType) == typeid(Int16));
-
-	typedef TypeOneReplacer<Type5, Int8, Int32>::HeadType TypeOneReplacer1;
-	assert (5 == TypeOneReplacer1::length);
-	assert (typeid(TypeGetter<0, TypeOneReplacer1>::HeadType) == typeid(Int32));
-	assert (typeid(TypeGetter<1, TypeOneReplacer1>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<2, TypeOneReplacer1>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<3, TypeOneReplacer1>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<4, TypeOneReplacer1>::HeadType) == typeid(Int8));
-
-	typedef TypeAllReplacer<Type5, Int8, Int32>::HeadType TypeAllReplacer1;
-	assert (5 == TypeAllReplacer1::length);
-	assert (typeid(TypeGetter<0, TypeAllReplacer1>::HeadType) == typeid(Int32));
-	assert (typeid(TypeGetter<1, TypeAllReplacer1>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<2, TypeAllReplacer1>::HeadType) == typeid(Int32));
-	assert (typeid(TypeGetter<3, TypeAllReplacer1>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<4, TypeAllReplacer1>::HeadType) == typeid(Int32));
-
-	typedef TypeListType<Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void>::HeadType TypeVoid;
-	assert (typeid(TypeGetter<0, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<1, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<2, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<3, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<4, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<5, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<6, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<7, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<8, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<9, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<10, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<11, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<12, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<13, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<14, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<15, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<16, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<17, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<18, TypeVoid>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<19, TypeVoid>::HeadType) == typeid(Void));
-	
-
-	typedef TypeOneReplacer<TypeVoid, Void, Int8>::HeadType TypeFirstReplacer;
-	assert (typeid(TypeGetter<0, TypeFirstReplacer>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<2, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<3, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<4, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<5, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<6, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<7, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<8, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<9, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<10, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<11, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<12, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<13, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<14, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<15, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<16, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<17, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<18, TypeFirstReplacer>::HeadType) == typeid(Void));
-	assert (typeid(TypeGetter<19, TypeFirstReplacer>::HeadType) == typeid(Void));
-
-	typedef TypeOneReplacer<TypeFirstReplacer, Void, Int16>::HeadType TypeSecondReplacer;
-	assert (typeid(TypeGetter<0, TypeSecondReplacer>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeSecondReplacer>::HeadType) == typeid(Int16));
-
-	typedef TypeOneReplacer<TypeSecondReplacer, Void, Int32>::HeadType TypeThirdReplacer;
-	assert (typeid(TypeGetter<0, TypeThirdReplacer>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeThirdReplacer>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<2, TypeThirdReplacer>::HeadType) == typeid(Int32));
-
-
-	typedef TypeAllReplacer<TypeThirdReplacer, Void, float>::HeadType TypeFourthReplacer;
-	assert (typeid(TypeGetter<0, TypeFourthReplacer>::HeadType) == typeid(Int8));
-	assert (typeid(TypeGetter<1, TypeFourthReplacer>::HeadType) == typeid(Int16));
-	assert (typeid(TypeGetter<2, TypeFourthReplacer>::HeadType) == typeid(Int32));
-	assert (typeid(TypeGetter<3, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<4, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<5, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<6, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<7, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<8, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<9, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<10, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<11, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<12, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<13, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<14, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<15, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<16, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<17, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<18, TypeFourthReplacer>::HeadType) == typeid(float));
-	assert (typeid(TypeGetter<19, TypeFourthReplacer>::HeadType) == typeid(float));
-}
-
-
-void TypeListTest::setUp()
-{
-}
-
-
-void TypeListTest::tearDown()
-{
-}
-
-
-CppUnit::Test* TypeListTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("TypeListTest");
-
-	CppUnit_addTest(pSuite, TypeListTest, testTypeList);
-
-	return pSuite;
-}
+//
+// TypeListTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/TypeListTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "TypeListTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Tuple.h"
+#include "Poco/TypeList.h"
+#include "Poco/Void.h"
+#include <iostream>
+#if defined(_MSC_VER)
+#	pragma warning(disable:4800) // forcing value to bool 'true' or 'false' on MSVC 71
+#endif
+
+using Poco::TypeList;
+using Poco::Tuple;
+using Poco::NullTypeList;
+using Poco::TypeListType;
+using Poco::TypeGetter;
+using Poco::TypeLocator;
+using Poco::TypeAppender;
+using Poco::TypeOneEraser;
+using Poco::TypeAllEraser;
+using Poco::TypeDuplicateEraser;
+using Poco::TypeOneReplacer;
+using Poco::TypeAllReplacer;
+using Poco::Int8;
+using Poco::UInt8;
+using Poco::Int16;
+using Poco::UInt16;
+using Poco::Int32;
+using Poco::UInt32;
+using Poco::Int8;
+using Poco::UInt8;
+using Poco::Int16;
+using Poco::UInt16;
+using Poco::Int32;
+using Poco::UInt32;
+using Poco::Void;
+
+
+TypeListTest::TypeListTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+TypeListTest::~TypeListTest()
+{
+}
+
+
+void TypeListTest::testTypeList()
+{
+	typedef TypeListType<Int8,
+		UInt8,
+		Int16,
+		UInt16,
+		Int32,
+		UInt32,
+		float,
+		double,
+		Int8,
+		UInt8,
+		Int16,
+		UInt16,
+		Int32,
+		UInt32,
+		float>::HeadType Type15;
+
+	Tuple<TypeGetter<0, Type15>::HeadType,
+		TypeGetter<1, Type15>::HeadType,
+		TypeGetter<2, Type15>::HeadType,
+		TypeGetter<3, Type15>::HeadType,
+		TypeGetter<4, Type15>::HeadType,
+		TypeGetter<5, Type15>::HeadType,
+		TypeGetter<6, Type15>::HeadType,
+		TypeGetter<7, Type15>::HeadType,
+		TypeGetter<8, Type15>::HeadType,
+		TypeGetter<9, Type15>::HeadType> tuple;
+
+	static TypeLocator<Type15, Int8> pos0;
+	static TypeLocator<Type15, UInt8> pos1;
+	static TypeLocator<Type15, Int16> pos2;
+	static TypeLocator<Type15, UInt16> pos3;
+	static TypeLocator<Type15, Int32> pos4;
+	static TypeLocator<Type15, UInt32> pos5;
+	static TypeLocator<Type15, float> pos6;
+	static TypeLocator<Type15, double> pos7;
+	static TypeLocator<Type15, Int8> pos8;
+	static TypeLocator<Type15, std::string> posUnknown;
+
+	assert (pos0.value == 0);
+	assert (pos1.value == 1);
+	assert (pos2.value == 2);
+	assert (pos3.value == 3);
+	assert (pos4.value == 4);
+	assert (pos5.value == 5);
+	assert (pos6.value == 6);
+	assert (pos7.value == 7);
+	assert (pos8.value == 0);
+	assert (posUnknown.value == -1);
+
+	tuple.set<TypeLocator<Type15, Int32>::value >(-123);
+	assert (-123 == tuple.get<4>());
+
+	assert (typeid(TypeGetter<0, Type15>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<0, Type15>::ConstHeadType) == typeid(const Int8));
+	assert (typeid(TypeGetter<1, Type15>::HeadType) == typeid(UInt8));
+	assert (typeid(TypeGetter<1, Type15>::ConstHeadType) == typeid(const UInt8));
+	assert (typeid(TypeGetter<2, Type15>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<2, Type15>::ConstHeadType) == typeid(const Int16));
+	assert (typeid(TypeGetter<3, Type15>::HeadType) == typeid(UInt16));
+	assert (typeid(TypeGetter<3, Type15>::ConstHeadType) == typeid(const UInt16));
+	assert (typeid(TypeGetter<4, Type15>::HeadType) == typeid(Int32));
+	assert (typeid(TypeGetter<4, Type15>::ConstHeadType) == typeid(const Int32));
+	assert (typeid(TypeGetter<5, Type15>::HeadType) == typeid(UInt32));
+	assert (typeid(TypeGetter<5, Type15>::ConstHeadType) == typeid(const UInt32));
+	assert (typeid(TypeGetter<6, Type15>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<6, Type15>::ConstHeadType) == typeid(const float));
+	assert (typeid(TypeGetter<7, Type15>::HeadType) == typeid(double));
+	assert (typeid(TypeGetter<7, Type15>::ConstHeadType) == typeid(const double));
+	assert (typeid(TypeGetter<8, Type15>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<8, Type15>::ConstHeadType) == typeid(const Int8));
+	assert (typeid(TypeGetter<9, Type15>::HeadType) == typeid(UInt8));
+	assert (typeid(TypeGetter<9, Type15>::ConstHeadType) == typeid(const UInt8));
+	assert (typeid(TypeGetter<10, Type15>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<10, Type15>::ConstHeadType) == typeid(const Int16));
+	assert (typeid(TypeGetter<11, Type15>::HeadType) == typeid(UInt16));
+	assert (typeid(TypeGetter<11, Type15>::ConstHeadType) == typeid(const UInt16));
+	assert (typeid(TypeGetter<12, Type15>::HeadType) == typeid(Int32));
+	assert (typeid(TypeGetter<12, Type15>::ConstHeadType) == typeid(const Int32));
+	assert (typeid(TypeGetter<13, Type15>::HeadType) == typeid(UInt32));
+	assert (typeid(TypeGetter<13, Type15>::ConstHeadType) == typeid(const UInt32));
+	assert (typeid(TypeGetter<14, Type15>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<14, Type15>::ConstHeadType) == typeid(const float));
+
+	typedef TypeListType<Int8>::HeadType Type1;
+	assert (1 == Type1::length);
+	typedef TypeListType<Int16, Int32>::HeadType Type2;
+	assert (2 == Type2::length);
+	typedef TypeAppender<Type1, Type2>::HeadType Type3;
+	assert (3 == Type3::length);
+
+	assert (typeid(TypeGetter<0, Type3>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, Type3>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<2, Type3>::HeadType) == typeid(Int32));
+
+	static TypeLocator<Type3, Int8> posNo1;
+	static TypeLocator<Type3, Int16> posNo2;
+	static TypeLocator<Type3, Int32> posNo3;
+
+	assert (posNo1.value == 0);
+	assert (posNo2.value == 1);
+	assert (posNo3.value == 2);
+
+	typedef TypeOneEraser<Type3, Int8>::HeadType TypeEraser1;
+	assert (2 == TypeEraser1::length);
+	assert (typeid(TypeGetter<0, TypeEraser1>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<1, TypeEraser1>::HeadType) == typeid(Int32));
+
+	typedef TypeOneEraser<Type3, Int16>::HeadType TypeEraser2;
+	assert (2 == TypeEraser2::length);
+	assert (typeid(TypeGetter<0, TypeEraser2>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeEraser2>::HeadType) == typeid(Int32));
+
+	typedef TypeOneEraser<Type3, Int32>::HeadType TypeEraser3;
+	assert (2 == TypeEraser3::length);
+	assert (typeid(TypeGetter<0, TypeEraser3>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeEraser3>::HeadType) == typeid(Int16));
+
+	typedef TypeListType<Int8,Int16,Int8,Int16,Int8>::HeadType Type5;
+	typedef TypeAllEraser<Type5, Int8>::HeadType TypeAllEraser3;
+	assert (2 == TypeAllEraser3::length);
+	assert (typeid(TypeGetter<0, TypeAllEraser3>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<1, TypeAllEraser3>::HeadType) == typeid(Int16));
+
+	typedef TypeDuplicateEraser<Type5>::HeadType TypeDuplicateEraser1;
+	assert (2 == TypeDuplicateEraser1::length);
+	assert (typeid(TypeGetter<0, TypeDuplicateEraser1>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeDuplicateEraser1>::HeadType) == typeid(Int16));
+
+	typedef TypeOneReplacer<Type5, Int8, Int32>::HeadType TypeOneReplacer1;
+	assert (5 == TypeOneReplacer1::length);
+	assert (typeid(TypeGetter<0, TypeOneReplacer1>::HeadType) == typeid(Int32));
+	assert (typeid(TypeGetter<1, TypeOneReplacer1>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<2, TypeOneReplacer1>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<3, TypeOneReplacer1>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<4, TypeOneReplacer1>::HeadType) == typeid(Int8));
+
+	typedef TypeAllReplacer<Type5, Int8, Int32>::HeadType TypeAllReplacer1;
+	assert (5 == TypeAllReplacer1::length);
+	assert (typeid(TypeGetter<0, TypeAllReplacer1>::HeadType) == typeid(Int32));
+	assert (typeid(TypeGetter<1, TypeAllReplacer1>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<2, TypeAllReplacer1>::HeadType) == typeid(Int32));
+	assert (typeid(TypeGetter<3, TypeAllReplacer1>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<4, TypeAllReplacer1>::HeadType) == typeid(Int32));
+
+	typedef TypeListType<Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void,Void>::HeadType TypeVoid;
+	assert (typeid(TypeGetter<0, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<1, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<2, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<3, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<4, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<5, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<6, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<7, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<8, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<9, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<10, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<11, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<12, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<13, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<14, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<15, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<16, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<17, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<18, TypeVoid>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<19, TypeVoid>::HeadType) == typeid(Void));
+	
+
+	typedef TypeOneReplacer<TypeVoid, Void, Int8>::HeadType TypeFirstReplacer;
+	assert (typeid(TypeGetter<0, TypeFirstReplacer>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<2, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<3, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<4, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<5, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<6, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<7, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<8, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<9, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<10, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<11, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<12, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<13, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<14, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<15, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<16, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<17, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<18, TypeFirstReplacer>::HeadType) == typeid(Void));
+	assert (typeid(TypeGetter<19, TypeFirstReplacer>::HeadType) == typeid(Void));
+
+	typedef TypeOneReplacer<TypeFirstReplacer, Void, Int16>::HeadType TypeSecondReplacer;
+	assert (typeid(TypeGetter<0, TypeSecondReplacer>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeSecondReplacer>::HeadType) == typeid(Int16));
+
+	typedef TypeOneReplacer<TypeSecondReplacer, Void, Int32>::HeadType TypeThirdReplacer;
+	assert (typeid(TypeGetter<0, TypeThirdReplacer>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeThirdReplacer>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<2, TypeThirdReplacer>::HeadType) == typeid(Int32));
+
+
+	typedef TypeAllReplacer<TypeThirdReplacer, Void, float>::HeadType TypeFourthReplacer;
+	assert (typeid(TypeGetter<0, TypeFourthReplacer>::HeadType) == typeid(Int8));
+	assert (typeid(TypeGetter<1, TypeFourthReplacer>::HeadType) == typeid(Int16));
+	assert (typeid(TypeGetter<2, TypeFourthReplacer>::HeadType) == typeid(Int32));
+	assert (typeid(TypeGetter<3, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<4, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<5, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<6, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<7, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<8, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<9, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<10, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<11, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<12, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<13, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<14, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<15, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<16, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<17, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<18, TypeFourthReplacer>::HeadType) == typeid(float));
+	assert (typeid(TypeGetter<19, TypeFourthReplacer>::HeadType) == typeid(float));
+}
+
+
+void TypeListTest::setUp()
+{
+}
+
+
+void TypeListTest::tearDown()
+{
+}
+
+
+CppUnit::Test* TypeListTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("TypeListTest");
+
+	CppUnit_addTest(pSuite, TypeListTest, testTypeList);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/TypeListTest.h b/Foundation/testsuite/src/TypeListTest.h
index 954d06003..76e9434c3 100644
--- a/Foundation/testsuite/src/TypeListTest.h
+++ b/Foundation/testsuite/src/TypeListTest.h
@@ -1,59 +1,59 @@
-//
-// TypeListTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/TypeListTest.h#2 $
-//
-// Definition of the TypeListTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef TypeListTest_INCLUDED
-#define TypeListTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class TypeListTest: public CppUnit::TestCase
-{
-public:
-	TypeListTest(const std::string& name);
-	~TypeListTest();
-
-	void testTypeList();
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // TypeListTest_INCLUDED
+//
+// TypeListTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/TypeListTest.h#2 $
+//
+// Definition of the TypeListTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef TypeListTest_INCLUDED
+#define TypeListTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class TypeListTest: public CppUnit::TestCase
+{
+public:
+	TypeListTest(const std::string& name);
+	~TypeListTest();
+
+	void testTypeList();
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // TypeListTest_INCLUDED
diff --git a/Foundation/testsuite/src/UTF8StringTest.cpp b/Foundation/testsuite/src/UTF8StringTest.cpp
index 43e2bb1dd..5c2c82f71 100644
--- a/Foundation/testsuite/src/UTF8StringTest.cpp
+++ b/Foundation/testsuite/src/UTF8StringTest.cpp
@@ -1,122 +1,122 @@
-//
-// UTF8StringTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/UTF8StringTest.cpp#2 $
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "UTF8StringTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/UTF8String.h"
-
-
-using Poco::UTF8;
-
-
-UTF8StringTest::UTF8StringTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-UTF8StringTest::~UTF8StringTest()
-{
-}
-
-
-void UTF8StringTest::testCompare()
-{
-	std::string a1("aaaaa");
-	std::string b1("bbbbb");
-	
-	assert (UTF8::icompare(a1, b1) < 0);
-
-	std::string a2("aaaaa");
-	std::string b2("BBBBB");
-	
-	assert (UTF8::icompare(a2, b2) < 0);
-
-	std::string a3("AAAAA");
-	std::string b3("bbbbb");
-	
-	assert (UTF8::icompare(a3, b3) < 0);
-
-	std::string a4("aaaaa");
-	std::string b4("AAAAA");
-	
-	assert (UTF8::icompare(a4, b4) == 0);
-	
-	std::string a5("AAAAA");
-	std::string b5("bbbbb");
-	
-	assert (UTF8::icompare(a5, b5) < 0);
-
-	std::string a6("\303\274\303\266\303\244"); // "u"a"o
-	std::string b6("\303\234\303\226\303\204"); // "U"A"O
-	
-	assert (UTF8::icompare(a6, b6) == 0);
-}
-
-
-void UTF8StringTest::testTransform()
-{
-	std::string s1("abcde");
-	UTF8::toUpperInPlace(s1);
-	assert (s1 == "ABCDE");
-
-	std::string s2("aBcDe123");
-	UTF8::toUpperInPlace(s2);
-	assert (s2 == "ABCDE123");
-
-	std::string s3("\303\274\303\266\303\244"); // "u"a"o
-	UTF8::toUpperInPlace(s3);	
-	assert (s3 == "\303\234\303\226\303\204"); // "U"A"O
-	UTF8::toLowerInPlace(s3);
-	assert (s3 == "\303\274\303\266\303\244"); // "U"A"O
-}
-
-
-void UTF8StringTest::setUp()
-{
-}
-
-
-void UTF8StringTest::tearDown()
-{
-}
-
-
-CppUnit::Test* UTF8StringTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("UTF8StringTest");
-
-	CppUnit_addTest(pSuite, UTF8StringTest, testCompare);
-	CppUnit_addTest(pSuite, UTF8StringTest, testTransform);
-
-	return pSuite;
-}
+//
+// UTF8StringTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/UTF8StringTest.cpp#2 $
+//
+// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "UTF8StringTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/UTF8String.h"
+
+
+using Poco::UTF8;
+
+
+UTF8StringTest::UTF8StringTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+UTF8StringTest::~UTF8StringTest()
+{
+}
+
+
+void UTF8StringTest::testCompare()
+{
+	std::string a1("aaaaa");
+	std::string b1("bbbbb");
+	
+	assert (UTF8::icompare(a1, b1) < 0);
+
+	std::string a2("aaaaa");
+	std::string b2("BBBBB");
+	
+	assert (UTF8::icompare(a2, b2) < 0);
+
+	std::string a3("AAAAA");
+	std::string b3("bbbbb");
+	
+	assert (UTF8::icompare(a3, b3) < 0);
+
+	std::string a4("aaaaa");
+	std::string b4("AAAAA");
+	
+	assert (UTF8::icompare(a4, b4) == 0);
+	
+	std::string a5("AAAAA");
+	std::string b5("bbbbb");
+	
+	assert (UTF8::icompare(a5, b5) < 0);
+
+	std::string a6("\303\274\303\266\303\244"); // "u"a"o
+	std::string b6("\303\234\303\226\303\204"); // "U"A"O
+	
+	assert (UTF8::icompare(a6, b6) == 0);
+}
+
+
+void UTF8StringTest::testTransform()
+{
+	std::string s1("abcde");
+	UTF8::toUpperInPlace(s1);
+	assert (s1 == "ABCDE");
+
+	std::string s2("aBcDe123");
+	UTF8::toUpperInPlace(s2);
+	assert (s2 == "ABCDE123");
+
+	std::string s3("\303\274\303\266\303\244"); // "u"a"o
+	UTF8::toUpperInPlace(s3);	
+	assert (s3 == "\303\234\303\226\303\204"); // "U"A"O
+	UTF8::toLowerInPlace(s3);
+	assert (s3 == "\303\274\303\266\303\244"); // "U"A"O
+}
+
+
+void UTF8StringTest::setUp()
+{
+}
+
+
+void UTF8StringTest::tearDown()
+{
+}
+
+
+CppUnit::Test* UTF8StringTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("UTF8StringTest");
+
+	CppUnit_addTest(pSuite, UTF8StringTest, testCompare);
+	CppUnit_addTest(pSuite, UTF8StringTest, testTransform);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/UTF8StringTest.h b/Foundation/testsuite/src/UTF8StringTest.h
index f521cd657..9fc4d53fe 100644
--- a/Foundation/testsuite/src/UTF8StringTest.h
+++ b/Foundation/testsuite/src/UTF8StringTest.h
@@ -1,61 +1,61 @@
-//
-// UTF8StringTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/UTF8StringTest.h#2 $
-//
-// Definition of the UTF8StringTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef UTF8StringTest_INCLUDED
-#define UTF8StringTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class UTF8StringTest: public CppUnit::TestCase
-{
-public:
-	UTF8StringTest(const std::string& name);
-	~UTF8StringTest();
-
-	void testCompare();
-	void testTransform();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // UTF8StringTest_INCLUDED
+//
+// UTF8StringTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/UTF8StringTest.h#2 $
+//
+// Definition of the UTF8StringTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef UTF8StringTest_INCLUDED
+#define UTF8StringTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class UTF8StringTest: public CppUnit::TestCase
+{
+public:
+	UTF8StringTest(const std::string& name);
+	~UTF8StringTest();
+
+	void testCompare();
+	void testTransform();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // UTF8StringTest_INCLUDED
diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
index 7682363db..4e60b34b1 100644
--- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
@@ -1,276 +1,276 @@
-//
-// UniqueExpireCacheTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireCacheTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "UniqueExpireCacheTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Exception.h"
-#include "Poco/UniqueExpireCache.h"
-#include "Poco/UniqueAccessExpireCache.h"
-#include "Poco/ExpirationDecorator.h"
-#include "Poco/AccessExpirationDecorator.h"
-#include "Poco/Bugcheck.h"
-#include "Poco/Thread.h"
-
-
-using namespace Poco;
-
-
-struct IntVal
-{
-	int value;
-	Poco::Timestamp validUntil;
-	IntVal(int val, Poco::Timestamp::TimeDiff v):value(val), validUntil()
-	{
-		validUntil += (v*1000);
-	}
-
-	const Poco::Timestamp& getExpiration() const
-	{
-		return validUntil;
-	}
-};
-
-typedef AccessExpirationDecorator<int> DIntVal;
-
-#define DURSLEEP 250
-#define DURHALFSLEEP DURSLEEP / 2
-#define DURWAIT  300
-
-
-UniqueExpireCacheTest::UniqueExpireCacheTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-UniqueExpireCacheTest::~UniqueExpireCacheTest()
-{
-}
-
-
-void UniqueExpireCacheTest::testClear()
-{
-	UniqueExpireCache<int, IntVal> aCache;
-	aCache.add(1, IntVal(2, DURSLEEP));
-	aCache.add(3, IntVal(4, DURSLEEP));
-	aCache.add(5, IntVal(6, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(1)->value == 2);
-	assert (aCache.get(3)->value == 4);
-	assert (aCache.get(5)->value == 6);
-	aCache.clear();
-	assert (!aCache.has(1));
-	assert (!aCache.has(3));
-	assert (!aCache.has(5));
-}
-
-
-void UniqueExpireCacheTest::testAccessClear()
-{
-	UniqueAccessExpireCache<int, DIntVal> aCache;
-	aCache.add(1, DIntVal(2, DURSLEEP));
-	aCache.add(3, DIntVal(4, DURSLEEP));
-	aCache.add(5, DIntVal(6, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(1)->value() == 2);
-	assert (aCache.get(3)->value() == 4);
-	assert (aCache.get(5)->value() == 6);
-	aCache.clear();
-	assert (!aCache.has(1));
-	assert (!aCache.has(3));
-	assert (!aCache.has(5));
-}
-
-
-void UniqueExpireCacheTest::testAccessUpdate()
-{
-	UniqueAccessExpireCache<int, DIntVal> aCache;
-	aCache.add(1, DIntVal(2, DURSLEEP));
-	aCache.add(3, DIntVal(4, DURSLEEP));
-	aCache.add(5, DIntVal(6, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(1)->value() == 2);
-	Thread::sleep(DURSLEEP/2);
-	assert (aCache.get(1)->value() == 2);
-	Thread::sleep(DURSLEEP/2);
-	assert (aCache.get(1)->value() == 2);
-	Thread::sleep(DURSLEEP/2);
-	assert (aCache.get(1)->value() == 2);
-	assert (!aCache.has(3));
-	assert (!aCache.has(5));
-	Thread::sleep(DURSLEEP*2);
-	
-	assert (!aCache.has(1));
-	assert (!aCache.has(3));
-	assert (!aCache.has(5));
-	aCache.remove(666); //must work too
-}
-
-
-void UniqueExpireCacheTest::testExpire0()
-{
-	UniqueExpireCache<int, IntVal> aCache;
-	aCache.add(1, IntVal(2, 0));
-	assert (!aCache.has(1));
-}
-
-
-
-void UniqueExpireCacheTest::testAccessExpire0()
-{
-	UniqueAccessExpireCache<int, DIntVal> aCache;
-	aCache.add(1, DIntVal(2, Timespan(0, 0)));
-	assert (!aCache.has(1));
-}
-
-
-void UniqueExpireCacheTest::testExpireN()
-{
-	// 3-1 represents the cache sorted by age, elements get replaced at the end of the list
-	// 3-1|5 -> 5 gets removed
-	UniqueExpireCache<int, IntVal> aCache;
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	SharedPtr<IntVal> tmp = aCache.get(1);
-	assert (!tmp.isNull());
-	assert (tmp->value == 2);
-	Thread::sleep(DURWAIT);
-	assert (!aCache.has(1));
-
-	// tmp must still be valid, access it
-	assert (tmp->value == 2);
-	tmp = aCache.get(1);
-	assert (tmp.isNull());
-
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	Thread::sleep(DURHALFSLEEP);
-	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	tmp = aCache.get(1);
-	SharedPtr<IntVal> tmp2 = aCache.get(3);
-	assert (tmp->value == 2); 
-	assert (tmp2->value == 4);
-
-	Thread::sleep(DURHALFSLEEP+25); //3|1
-	assert (!aCache.has(1));
-	assert (aCache.has(3));
-	assert (tmp->value == 2); // 1-3
-	assert (tmp2->value == 4); // 3-1
-	tmp2 = aCache.get(3);
-	assert (tmp2->value == 4);
-	Thread::sleep(DURHALFSLEEP+25); //3|1
-	assert (!aCache.has(3));
-	assert (tmp2->value == 4);
-	tmp = aCache.get(1);
-	tmp2 = aCache.get(3);
-	assert (!tmp);
-	assert (!tmp2);
-
-	// removing illegal entries should work too
-	aCache.remove(666);
-
-	aCache.clear();
-	assert (!aCache.has(5));
-	assert (!aCache.has(3));
-}
-
-
-void UniqueExpireCacheTest::testDuplicateAdd()
-{
-	UniqueExpireCache<int, IntVal> aCache;
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 2);
-	aCache.add(1, IntVal(3, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 3);
-}
-
-
-void UniqueExpireCacheTest::testAccessDuplicateAdd()
-{
-	UniqueAccessExpireCache<int, DIntVal> aCache;
-	aCache.add(1, DIntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value() == 2);
-	aCache.add(1, DIntVal(3, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value() == 3);
-}
-
-
-void UniqueExpireCacheTest::testExpirationDecorator()
-{
-	typedef ExpirationDecorator<int> ExpireInt;
-	UniqueExpireCache<int, ExpireInt> aCache;
-	aCache.add(1, ExpireInt(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value() == 2);
-	aCache.add(1, ExpireInt(3, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value() == 3);
-}
-
-
-void UniqueExpireCacheTest::setUp()
-{
-}
-
-
-void UniqueExpireCacheTest::tearDown()
-{
-}
-
-
-CppUnit::Test* UniqueExpireCacheTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("UniqueExpireCacheTest");
-
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testClear);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessClear);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessUpdate);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpire0);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessExpire0);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpireN);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testDuplicateAdd);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessDuplicateAdd);
-	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpirationDecorator);
-
-	return pSuite;
-}
+//
+// UniqueExpireCacheTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireCacheTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "UniqueExpireCacheTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Exception.h"
+#include "Poco/UniqueExpireCache.h"
+#include "Poco/UniqueAccessExpireCache.h"
+#include "Poco/ExpirationDecorator.h"
+#include "Poco/AccessExpirationDecorator.h"
+#include "Poco/Bugcheck.h"
+#include "Poco/Thread.h"
+
+
+using namespace Poco;
+
+
+struct IntVal
+{
+	int value;
+	Poco::Timestamp validUntil;
+	IntVal(int val, Poco::Timestamp::TimeDiff v):value(val), validUntil()
+	{
+		validUntil += (v*1000);
+	}
+
+	const Poco::Timestamp& getExpiration() const
+	{
+		return validUntil;
+	}
+};
+
+typedef AccessExpirationDecorator<int> DIntVal;
+
+#define DURSLEEP 250
+#define DURHALFSLEEP DURSLEEP / 2
+#define DURWAIT  300
+
+
+UniqueExpireCacheTest::UniqueExpireCacheTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+UniqueExpireCacheTest::~UniqueExpireCacheTest()
+{
+}
+
+
+void UniqueExpireCacheTest::testClear()
+{
+	UniqueExpireCache<int, IntVal> aCache;
+	aCache.add(1, IntVal(2, DURSLEEP));
+	aCache.add(3, IntVal(4, DURSLEEP));
+	aCache.add(5, IntVal(6, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(1)->value == 2);
+	assert (aCache.get(3)->value == 4);
+	assert (aCache.get(5)->value == 6);
+	aCache.clear();
+	assert (!aCache.has(1));
+	assert (!aCache.has(3));
+	assert (!aCache.has(5));
+}
+
+
+void UniqueExpireCacheTest::testAccessClear()
+{
+	UniqueAccessExpireCache<int, DIntVal> aCache;
+	aCache.add(1, DIntVal(2, DURSLEEP));
+	aCache.add(3, DIntVal(4, DURSLEEP));
+	aCache.add(5, DIntVal(6, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(1)->value() == 2);
+	assert (aCache.get(3)->value() == 4);
+	assert (aCache.get(5)->value() == 6);
+	aCache.clear();
+	assert (!aCache.has(1));
+	assert (!aCache.has(3));
+	assert (!aCache.has(5));
+}
+
+
+void UniqueExpireCacheTest::testAccessUpdate()
+{
+	UniqueAccessExpireCache<int, DIntVal> aCache;
+	aCache.add(1, DIntVal(2, DURSLEEP));
+	aCache.add(3, DIntVal(4, DURSLEEP));
+	aCache.add(5, DIntVal(6, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(1)->value() == 2);
+	Thread::sleep(DURSLEEP/2);
+	assert (aCache.get(1)->value() == 2);
+	Thread::sleep(DURSLEEP/2);
+	assert (aCache.get(1)->value() == 2);
+	Thread::sleep(DURSLEEP/2);
+	assert (aCache.get(1)->value() == 2);
+	assert (!aCache.has(3));
+	assert (!aCache.has(5));
+	Thread::sleep(DURSLEEP*2);
+	
+	assert (!aCache.has(1));
+	assert (!aCache.has(3));
+	assert (!aCache.has(5));
+	aCache.remove(666); //must work too
+}
+
+
+void UniqueExpireCacheTest::testExpire0()
+{
+	UniqueExpireCache<int, IntVal> aCache;
+	aCache.add(1, IntVal(2, 0));
+	assert (!aCache.has(1));
+}
+
+
+
+void UniqueExpireCacheTest::testAccessExpire0()
+{
+	UniqueAccessExpireCache<int, DIntVal> aCache;
+	aCache.add(1, DIntVal(2, Timespan(0, 0)));
+	assert (!aCache.has(1));
+}
+
+
+void UniqueExpireCacheTest::testExpireN()
+{
+	// 3-1 represents the cache sorted by age, elements get replaced at the end of the list
+	// 3-1|5 -> 5 gets removed
+	UniqueExpireCache<int, IntVal> aCache;
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	SharedPtr<IntVal> tmp = aCache.get(1);
+	assert (!tmp.isNull());
+	assert (tmp->value == 2);
+	Thread::sleep(DURWAIT);
+	assert (!aCache.has(1));
+
+	// tmp must still be valid, access it
+	assert (tmp->value == 2);
+	tmp = aCache.get(1);
+	assert (tmp.isNull());
+
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	Thread::sleep(DURHALFSLEEP);
+	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	tmp = aCache.get(1);
+	SharedPtr<IntVal> tmp2 = aCache.get(3);
+	assert (tmp->value == 2); 
+	assert (tmp2->value == 4);
+
+	Thread::sleep(DURHALFSLEEP+25); //3|1
+	assert (!aCache.has(1));
+	assert (aCache.has(3));
+	assert (tmp->value == 2); // 1-3
+	assert (tmp2->value == 4); // 3-1
+	tmp2 = aCache.get(3);
+	assert (tmp2->value == 4);
+	Thread::sleep(DURHALFSLEEP+25); //3|1
+	assert (!aCache.has(3));
+	assert (tmp2->value == 4);
+	tmp = aCache.get(1);
+	tmp2 = aCache.get(3);
+	assert (!tmp);
+	assert (!tmp2);
+
+	// removing illegal entries should work too
+	aCache.remove(666);
+
+	aCache.clear();
+	assert (!aCache.has(5));
+	assert (!aCache.has(3));
+}
+
+
+void UniqueExpireCacheTest::testDuplicateAdd()
+{
+	UniqueExpireCache<int, IntVal> aCache;
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 2);
+	aCache.add(1, IntVal(3, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 3);
+}
+
+
+void UniqueExpireCacheTest::testAccessDuplicateAdd()
+{
+	UniqueAccessExpireCache<int, DIntVal> aCache;
+	aCache.add(1, DIntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value() == 2);
+	aCache.add(1, DIntVal(3, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value() == 3);
+}
+
+
+void UniqueExpireCacheTest::testExpirationDecorator()
+{
+	typedef ExpirationDecorator<int> ExpireInt;
+	UniqueExpireCache<int, ExpireInt> aCache;
+	aCache.add(1, ExpireInt(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value() == 2);
+	aCache.add(1, ExpireInt(3, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value() == 3);
+}
+
+
+void UniqueExpireCacheTest::setUp()
+{
+}
+
+
+void UniqueExpireCacheTest::tearDown()
+{
+}
+
+
+CppUnit::Test* UniqueExpireCacheTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("UniqueExpireCacheTest");
+
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testClear);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessClear);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessUpdate);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpire0);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessExpire0);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpireN);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testDuplicateAdd);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testAccessDuplicateAdd);
+	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpirationDecorator);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.h b/Foundation/testsuite/src/UniqueExpireCacheTest.h
index 06fee8ed8..717a7d989 100644
--- a/Foundation/testsuite/src/UniqueExpireCacheTest.h
+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.h
@@ -1,64 +1,64 @@
-//
-// UniqueExpireCacheTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireCacheTest.h#2 $
-//
-// Tests for ExpireCache
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-#ifndef UniqueExpireCacheTest_INCLUDED
-#define UniqueExpireCacheTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class UniqueExpireCacheTest: public CppUnit::TestCase
-{
-public:
-	UniqueExpireCacheTest(const std::string& name);
-	~UniqueExpireCacheTest();
-
-	void testClear();
-	void testAccessClear();
-	void testDuplicateAdd();
-	void testAccessDuplicateAdd();
-	void testExpire0();
-	void testAccessExpire0();
-	void testExpireN();
-	void testExpirationDecorator();
-	void testAccessUpdate();
-	
-	void setUp();
-	void tearDown();
-	static CppUnit::Test* suite();
-};
-
-
-#endif // UniqueExpireCacheTest_INCLUDED
+//
+// UniqueExpireCacheTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireCacheTest.h#2 $
+//
+// Tests for ExpireCache
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+#ifndef UniqueExpireCacheTest_INCLUDED
+#define UniqueExpireCacheTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class UniqueExpireCacheTest: public CppUnit::TestCase
+{
+public:
+	UniqueExpireCacheTest(const std::string& name);
+	~UniqueExpireCacheTest();
+
+	void testClear();
+	void testAccessClear();
+	void testDuplicateAdd();
+	void testAccessDuplicateAdd();
+	void testExpire0();
+	void testAccessExpire0();
+	void testExpireN();
+	void testExpirationDecorator();
+	void testAccessUpdate();
+	
+	void setUp();
+	void tearDown();
+	static CppUnit::Test* suite();
+};
+
+
+#endif // UniqueExpireCacheTest_INCLUDED
diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
index 397b72f6e..749a3c579 100644
--- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
+++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp
@@ -1,347 +1,347 @@
-//
-// UniqueExpireLRUCacheTest.cpp
-//
-// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "UniqueExpireLRUCacheTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Exception.h"
-#include "Poco/UniqueExpireLRUCache.h"
-#include "Poco/UniqueAccessExpireLRUCache.h"
-#include "Poco/AccessExpirationDecorator.h"
-#include "Poco/Bugcheck.h"
-#include "Poco/Thread.h"
-
-
-using namespace Poco;
-
-
-struct IntVal
-{
-	int value;
-	Poco::Timestamp validUntil;
-	IntVal(int val, Poco::Timestamp::TimeDiff v):value(val), validUntil()
-	{
-		validUntil += (v*1000);
-	}
-
-	const Poco::Timestamp& getExpiration() const
-	{
-		return validUntil;
-	}
-};
-
-
-typedef AccessExpirationDecorator<int> DIntVal;
-
-
-#define DURSLEEP 250
-#define DURHALFSLEEP DURSLEEP / 2
-#define DURWAIT  300
-
-
-UniqueExpireLRUCacheTest::UniqueExpireLRUCacheTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-UniqueExpireLRUCacheTest::~UniqueExpireLRUCacheTest()
-{
-}
-
-
-void UniqueExpireLRUCacheTest::testClear()
-{
-	UniqueExpireLRUCache<int, IntVal> aCache;
-	aCache.add(1, IntVal(2, DURSLEEP));
-	aCache.add(3, IntVal(4, DURSLEEP));
-	aCache.add(5, IntVal(6, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(1)->value == 2);
-	assert (aCache.get(3)->value == 4);
-	assert (aCache.get(5)->value == 6);
-	aCache.clear();
-	assert (!aCache.has(1));
-	assert (!aCache.has(3));
-	assert (!aCache.has(5));
-}
-
-
-
-void UniqueExpireLRUCacheTest::testAccessClear()
-{
-	UniqueAccessExpireLRUCache<int, DIntVal> aCache;
-	aCache.add(1, DIntVal(2, DURSLEEP));
-	aCache.add(3, DIntVal(4, DURSLEEP));
-	aCache.add(5, DIntVal(6, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(1)->value() == 2);
-	assert (aCache.get(3)->value() == 4);
-	assert (aCache.get(5)->value() == 6);
-	aCache.clear();
-	assert (!aCache.has(1));
-	assert (!aCache.has(3));
-	assert (!aCache.has(5));
-}
-
-void UniqueExpireLRUCacheTest::testExpire0()
-{
-	UniqueExpireLRUCache<int, IntVal> aCache;
-	aCache.add(1, IntVal(2, 0));
-	assert (!aCache.has(1));
-}
-
-
-void UniqueExpireLRUCacheTest::testExpireN()
-{
-	// 3-1 represents the cache sorted by age, elements get replaced at the end of the list
-	// 3-1|5 -> 5 gets removed
-	UniqueExpireLRUCache<int, IntVal> aCache(3);
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	SharedPtr<IntVal> tmp = aCache.get(1);
-	assert (!tmp.isNull());
-	assert (tmp->value == 2);
-	Thread::sleep(DURWAIT);
-	assert (!aCache.has(1));
-
-	// tmp must still be valid, access it
-	assert (tmp->value == 2);
-	tmp = aCache.get(1);
-	assert (!tmp);
-
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	Thread::sleep(DURHALFSLEEP);
-	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	tmp = aCache.get(1);
-	SharedPtr<IntVal> tmp2 = aCache.get(3);
-	assert (tmp->value == 2); 
-	assert (tmp2->value == 4);
-
-	Thread::sleep(DURHALFSLEEP+25); //3|1
-	assert (!aCache.has(1));
-	assert (aCache.has(3));
-	assert (tmp->value == 2); // 1-3
-	assert (tmp2->value == 4); // 3-1
-	tmp2 = aCache.get(3);
-	assert (tmp2->value == 4);
-	Thread::sleep(DURHALFSLEEP+25); //3|1
-	assert (!aCache.has(3));
-	assert (tmp2->value == 4);
-	tmp = aCache.get(1);
-	tmp2 = aCache.get(3);
-	assert (!tmp);
-	assert (!tmp2);
-
-	// removing illegal entries should work too
-	aCache.remove(666);
-
-	aCache.clear();
-	assert (!aCache.has(5));
-	assert (!aCache.has(3));
-}
-
-
-void UniqueExpireLRUCacheTest::testCacheSize0()
-{
-	// cache size 0 is illegal
-	try
-	{
-		UniqueExpireLRUCache<int, IntVal> aCache(0);
-		failmsg ("cache size of 0 is illegal, test should fail");
-	}
-	catch (Poco::InvalidArgumentException&)
-	{
-	}
-}
-
-
-void UniqueExpireLRUCacheTest::testCacheSize1()
-{
-	UniqueExpireLRUCache<int, IntVal> aCache(1);
-	aCache.add(1, IntVal(2, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 2);
-
-	aCache.add(3, IntVal(4, DURSLEEP)); // replaces 1
-	assert (!aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.get(3)->value == 4);
-
-	aCache.add(5, IntVal(6, DURSLEEP));
-	assert (!aCache.has(1));
-	assert (!aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(5)->value == 6);
-
-	aCache.remove(5);
-	assert (!aCache.has(5));
-
-	// removing illegal entries should work too
-	aCache.remove(666);
-}
-
-
-void UniqueExpireLRUCacheTest::testCacheSize2()
-{
-	// 3-1 represents the cache sorted by pos, elements get replaced at the end of the list
-	// 3-1|5 -> 5 gets removed
-	UniqueExpireLRUCache<int, IntVal> aCache(2);
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 2);
-
-	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.get(1)->value == 2); // 1-3
-	assert (aCache.get(3)->value == 4); // 3-1
-
-	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3|1
-	assert (!aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(5)->value == 6);  // 5-3
-	assert (aCache.get(3)->value == 4);  // 3-5
-
-	// test remove from the end and the beginning of the list
-	aCache.remove(5); // 3
-	assert (!aCache.has(5));
-	assert (aCache.get(3)->value == 4);  // 3
-	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3
-	assert (aCache.get(3)->value == 4);  // 3-5
-	aCache.remove(3); // 5
-	assert (!aCache.has(3));
-	assert (aCache.get(5)->value == 6);  // 5
-
-	// removing illegal entries should work too
-	aCache.remove(666);
-
-	aCache.clear();
-	assert (!aCache.has(5));
-}
-
-
-void UniqueExpireLRUCacheTest::testCacheSizeN()
-{
-		// 3-1 represents the cache sorted by pos, elements get replaced at the end of the list
-	// 3-1|5 -> 5 gets removed
-	UniqueExpireLRUCache<int, IntVal> aCache(3);
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 2);
-
-	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.get(1)->value == 2); // 1-3
-	assert (aCache.get(3)->value == 4); // 3-1
-
-	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3-1
-	assert (aCache.has(1));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(5)->value == 6);  // 5-3-1
-	assert (aCache.get(3)->value == 4);  // 3-5-1
-
-	aCache.add(7, IntVal(8, DURSLEEP)); // 7-5-3|1
-	assert (!aCache.has(1));
-	assert (aCache.has(7));
-	assert (aCache.has(3));
-	assert (aCache.has(5));
-	assert (aCache.get(5)->value == 6);  // 5-7-3
-	assert (aCache.get(3)->value == 4);  // 3-5-7
-	assert (aCache.get(7)->value == 8);  // 7-3-5
-
-	// test remove from the end and the beginning of the list
-	aCache.remove(5); // 7-3
-	assert (!aCache.has(5));
-	assert (aCache.get(3)->value == 4);  // 3-7
-	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3-7
-	assert (aCache.get(7)->value == 8);  // 7-5-3
-	aCache.remove(7); // 5-3
-	assert (!aCache.has(7));
-	assert (aCache.has(3));
-	assert (aCache.get(5)->value == 6);  // 5-3
-
-	// removing illegal entries should work too
-	aCache.remove(666);
-
-	aCache.clear();
-	assert (!aCache.has(5));
-	assert (!aCache.has(3));
-}
-
-
-void UniqueExpireLRUCacheTest::testDuplicateAdd()
-{
-	UniqueExpireLRUCache<int, IntVal> aCache(3);
-	aCache.add(1, IntVal(2, DURSLEEP)); // 1
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 2);
-	aCache.add(1, IntVal(3, DURSLEEP));
-	assert (aCache.has(1));
-	assert (aCache.get(1)->value == 3);
-}
-
-
-void UniqueExpireLRUCacheTest::setUp()
-{
-}
-
-
-void UniqueExpireLRUCacheTest::tearDown()
-{
-}
-
-
-CppUnit::Test* UniqueExpireLRUCacheTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("UniqueExpireLRUCacheTest");
-
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testClear);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testAccessClear);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testExpire0);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testExpireN);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSize0);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSize1);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSize2);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSizeN);
-	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testDuplicateAdd);
-
-	return pSuite;
-}
+//
+// UniqueExpireLRUCacheTest.cpp
+//
+// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "UniqueExpireLRUCacheTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Exception.h"
+#include "Poco/UniqueExpireLRUCache.h"
+#include "Poco/UniqueAccessExpireLRUCache.h"
+#include "Poco/AccessExpirationDecorator.h"
+#include "Poco/Bugcheck.h"
+#include "Poco/Thread.h"
+
+
+using namespace Poco;
+
+
+struct IntVal
+{
+	int value;
+	Poco::Timestamp validUntil;
+	IntVal(int val, Poco::Timestamp::TimeDiff v):value(val), validUntil()
+	{
+		validUntil += (v*1000);
+	}
+
+	const Poco::Timestamp& getExpiration() const
+	{
+		return validUntil;
+	}
+};
+
+
+typedef AccessExpirationDecorator<int> DIntVal;
+
+
+#define DURSLEEP 250
+#define DURHALFSLEEP DURSLEEP / 2
+#define DURWAIT  300
+
+
+UniqueExpireLRUCacheTest::UniqueExpireLRUCacheTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+UniqueExpireLRUCacheTest::~UniqueExpireLRUCacheTest()
+{
+}
+
+
+void UniqueExpireLRUCacheTest::testClear()
+{
+	UniqueExpireLRUCache<int, IntVal> aCache;
+	aCache.add(1, IntVal(2, DURSLEEP));
+	aCache.add(3, IntVal(4, DURSLEEP));
+	aCache.add(5, IntVal(6, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(1)->value == 2);
+	assert (aCache.get(3)->value == 4);
+	assert (aCache.get(5)->value == 6);
+	aCache.clear();
+	assert (!aCache.has(1));
+	assert (!aCache.has(3));
+	assert (!aCache.has(5));
+}
+
+
+
+void UniqueExpireLRUCacheTest::testAccessClear()
+{
+	UniqueAccessExpireLRUCache<int, DIntVal> aCache;
+	aCache.add(1, DIntVal(2, DURSLEEP));
+	aCache.add(3, DIntVal(4, DURSLEEP));
+	aCache.add(5, DIntVal(6, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(1)->value() == 2);
+	assert (aCache.get(3)->value() == 4);
+	assert (aCache.get(5)->value() == 6);
+	aCache.clear();
+	assert (!aCache.has(1));
+	assert (!aCache.has(3));
+	assert (!aCache.has(5));
+}
+
+void UniqueExpireLRUCacheTest::testExpire0()
+{
+	UniqueExpireLRUCache<int, IntVal> aCache;
+	aCache.add(1, IntVal(2, 0));
+	assert (!aCache.has(1));
+}
+
+
+void UniqueExpireLRUCacheTest::testExpireN()
+{
+	// 3-1 represents the cache sorted by age, elements get replaced at the end of the list
+	// 3-1|5 -> 5 gets removed
+	UniqueExpireLRUCache<int, IntVal> aCache(3);
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	SharedPtr<IntVal> tmp = aCache.get(1);
+	assert (!tmp.isNull());
+	assert (tmp->value == 2);
+	Thread::sleep(DURWAIT);
+	assert (!aCache.has(1));
+
+	// tmp must still be valid, access it
+	assert (tmp->value == 2);
+	tmp = aCache.get(1);
+	assert (!tmp);
+
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	Thread::sleep(DURHALFSLEEP);
+	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	tmp = aCache.get(1);
+	SharedPtr<IntVal> tmp2 = aCache.get(3);
+	assert (tmp->value == 2); 
+	assert (tmp2->value == 4);
+
+	Thread::sleep(DURHALFSLEEP+25); //3|1
+	assert (!aCache.has(1));
+	assert (aCache.has(3));
+	assert (tmp->value == 2); // 1-3
+	assert (tmp2->value == 4); // 3-1
+	tmp2 = aCache.get(3);
+	assert (tmp2->value == 4);
+	Thread::sleep(DURHALFSLEEP+25); //3|1
+	assert (!aCache.has(3));
+	assert (tmp2->value == 4);
+	tmp = aCache.get(1);
+	tmp2 = aCache.get(3);
+	assert (!tmp);
+	assert (!tmp2);
+
+	// removing illegal entries should work too
+	aCache.remove(666);
+
+	aCache.clear();
+	assert (!aCache.has(5));
+	assert (!aCache.has(3));
+}
+
+
+void UniqueExpireLRUCacheTest::testCacheSize0()
+{
+	// cache size 0 is illegal
+	try
+	{
+		UniqueExpireLRUCache<int, IntVal> aCache(0);
+		failmsg ("cache size of 0 is illegal, test should fail");
+	}
+	catch (Poco::InvalidArgumentException&)
+	{
+	}
+}
+
+
+void UniqueExpireLRUCacheTest::testCacheSize1()
+{
+	UniqueExpireLRUCache<int, IntVal> aCache(1);
+	aCache.add(1, IntVal(2, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 2);
+
+	aCache.add(3, IntVal(4, DURSLEEP)); // replaces 1
+	assert (!aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.get(3)->value == 4);
+
+	aCache.add(5, IntVal(6, DURSLEEP));
+	assert (!aCache.has(1));
+	assert (!aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(5)->value == 6);
+
+	aCache.remove(5);
+	assert (!aCache.has(5));
+
+	// removing illegal entries should work too
+	aCache.remove(666);
+}
+
+
+void UniqueExpireLRUCacheTest::testCacheSize2()
+{
+	// 3-1 represents the cache sorted by pos, elements get replaced at the end of the list
+	// 3-1|5 -> 5 gets removed
+	UniqueExpireLRUCache<int, IntVal> aCache(2);
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 2);
+
+	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.get(1)->value == 2); // 1-3
+	assert (aCache.get(3)->value == 4); // 3-1
+
+	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3|1
+	assert (!aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(5)->value == 6);  // 5-3
+	assert (aCache.get(3)->value == 4);  // 3-5
+
+	// test remove from the end and the beginning of the list
+	aCache.remove(5); // 3
+	assert (!aCache.has(5));
+	assert (aCache.get(3)->value == 4);  // 3
+	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3
+	assert (aCache.get(3)->value == 4);  // 3-5
+	aCache.remove(3); // 5
+	assert (!aCache.has(3));
+	assert (aCache.get(5)->value == 6);  // 5
+
+	// removing illegal entries should work too
+	aCache.remove(666);
+
+	aCache.clear();
+	assert (!aCache.has(5));
+}
+
+
+void UniqueExpireLRUCacheTest::testCacheSizeN()
+{
+		// 3-1 represents the cache sorted by pos, elements get replaced at the end of the list
+	// 3-1|5 -> 5 gets removed
+	UniqueExpireLRUCache<int, IntVal> aCache(3);
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 2);
+
+	aCache.add(3, IntVal(4, DURSLEEP)); // 3-1
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.get(1)->value == 2); // 1-3
+	assert (aCache.get(3)->value == 4); // 3-1
+
+	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3-1
+	assert (aCache.has(1));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(5)->value == 6);  // 5-3-1
+	assert (aCache.get(3)->value == 4);  // 3-5-1
+
+	aCache.add(7, IntVal(8, DURSLEEP)); // 7-5-3|1
+	assert (!aCache.has(1));
+	assert (aCache.has(7));
+	assert (aCache.has(3));
+	assert (aCache.has(5));
+	assert (aCache.get(5)->value == 6);  // 5-7-3
+	assert (aCache.get(3)->value == 4);  // 3-5-7
+	assert (aCache.get(7)->value == 8);  // 7-3-5
+
+	// test remove from the end and the beginning of the list
+	aCache.remove(5); // 7-3
+	assert (!aCache.has(5));
+	assert (aCache.get(3)->value == 4);  // 3-7
+	aCache.add(5, IntVal(6, DURSLEEP)); // 5-3-7
+	assert (aCache.get(7)->value == 8);  // 7-5-3
+	aCache.remove(7); // 5-3
+	assert (!aCache.has(7));
+	assert (aCache.has(3));
+	assert (aCache.get(5)->value == 6);  // 5-3
+
+	// removing illegal entries should work too
+	aCache.remove(666);
+
+	aCache.clear();
+	assert (!aCache.has(5));
+	assert (!aCache.has(3));
+}
+
+
+void UniqueExpireLRUCacheTest::testDuplicateAdd()
+{
+	UniqueExpireLRUCache<int, IntVal> aCache(3);
+	aCache.add(1, IntVal(2, DURSLEEP)); // 1
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 2);
+	aCache.add(1, IntVal(3, DURSLEEP));
+	assert (aCache.has(1));
+	assert (aCache.get(1)->value == 3);
+}
+
+
+void UniqueExpireLRUCacheTest::setUp()
+{
+}
+
+
+void UniqueExpireLRUCacheTest::tearDown()
+{
+}
+
+
+CppUnit::Test* UniqueExpireLRUCacheTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("UniqueExpireLRUCacheTest");
+
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testClear);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testAccessClear);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testExpire0);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testExpireN);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSize0);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSize1);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSize2);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testCacheSizeN);
+	CppUnit_addTest(pSuite, UniqueExpireLRUCacheTest, testDuplicateAdd);
+
+	return pSuite;
+}
diff --git a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h
index 172a0fc41..5a411682d 100644
--- a/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h
+++ b/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h
@@ -1,64 +1,64 @@
-//
-// UniqueExpireLRUCacheTest.h
-//
-// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h#2 $
-//
-// Tests for UniqueExpireLRUCache
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-#ifndef UniqueExpireLRUCacheTest_INCLUDED
-#define UniqueExpireLRUCacheTest_INCLUDED
-
-
-#include "Poco/Foundation.h"
-#include "CppUnit/TestCase.h"
-
-
-class UniqueExpireLRUCacheTest: public CppUnit::TestCase
-{
-public:
-	UniqueExpireLRUCacheTest(const std::string& name);
-	~UniqueExpireLRUCacheTest();
-
-	void testClear();
-	void testAccessClear();
-	void testExpire0();
-	void testExpireN();
-	void testCacheSize0();
-	void testCacheSize1();
-	void testCacheSize2();
-	void testCacheSizeN();
-	void testDuplicateAdd();
-	
-	void setUp();
-	void tearDown();
-	static CppUnit::Test* suite();
-};
-
-
-#endif // UniqueExpireLRUCacheTest_INCLUDED
+//
+// UniqueExpireLRUCacheTest.h
+//
+// $Id: //poco/svn/Foundation/testsuite/src/UniqueExpireLRUCacheTest.h#2 $
+//
+// Tests for UniqueExpireLRUCache
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+#ifndef UniqueExpireLRUCacheTest_INCLUDED
+#define UniqueExpireLRUCacheTest_INCLUDED
+
+
+#include "Poco/Foundation.h"
+#include "CppUnit/TestCase.h"
+
+
+class UniqueExpireLRUCacheTest: public CppUnit::TestCase
+{
+public:
+	UniqueExpireLRUCacheTest(const std::string& name);
+	~UniqueExpireLRUCacheTest();
+
+	void testClear();
+	void testAccessClear();
+	void testExpire0();
+	void testExpireN();
+	void testCacheSize0();
+	void testCacheSize1();
+	void testCacheSize2();
+	void testCacheSizeN();
+	void testDuplicateAdd();
+	
+	void setUp();
+	void tearDown();
+	static CppUnit::Test* suite();
+};
+
+
+#endif // UniqueExpireLRUCacheTest_INCLUDED
diff --git a/Net/include/Poco/Net/AbstractHTTPRequestHandler.h b/Net/include/Poco/Net/AbstractHTTPRequestHandler.h
index 6fd124aee..90948474f 100644
--- a/Net/include/Poco/Net/AbstractHTTPRequestHandler.h
+++ b/Net/include/Poco/Net/AbstractHTTPRequestHandler.h
@@ -1,158 +1,158 @@
-//
-// AbstractHTTPRequestHandler.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/AbstractHTTPRequestHandler.h#2 $
-//
-// Library: Net
-// Package: HTTPServer
-// Module:  AbstractHTTPRequestHandler
-//
-// Definition of the AbstractHTTPRequestHandler class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_AbstractHTTPRequestHandler_INCLUDED
-#define Net_AbstractHTTPRequestHandler_INCLUDED
-
-
-#include "Poco/Net/HTTPRequestHandler.h"
-#include "Poco/Net/HTTPResponse.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-class HTMLForm;
-
-
-class Net_API AbstractHTTPRequestHandler: public HTTPRequestHandler
-	/// The abstract base class for AbstractHTTPRequestHandlers 
-	/// created by HTTPServer.
-	///
-	/// Derived classes must override the run() method.
-
-	/// Contrary to a HTTPRequestHandler, an AbstractHTTPRequestHandler
-	/// stores request and response as member variables to avoid having
-	/// to pass them around as method parameters. Additionally, a
-	/// HTMLForm object is created for use by subclasses.
-	///
-	/// The run() method must perform the complete handling
-	/// of the HTTP request connection. As soon as the run() 
-	/// method returns, the request handler object is destroyed.
-	///
-	/// A new AbstractHTTPRequestHandler object will be created for
-	/// each new HTTP request that is received by the HTTPServer.
-{
-public:
-	AbstractHTTPRequestHandler();
-		/// Creates the AbstractHTTPRequestHandler.
-
-	virtual ~AbstractHTTPRequestHandler();
-		/// Destroys the AbstractHTTPRequestHandler.
-
-	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response);
-		/// This class implements some common behavior,
-		/// before calling run() to actually handle the request:
-		///   - save request and response objects;
-		///   - call authorize();
-		///   - if authorize() returns true call run(),
-		///     else send 401 (Unauthorized) response.
-		///
-		/// If run() throws an exception and the response has not been
-		/// sent yet, sends a 500 (Internal Server Error) response with
-		/// the exception's display text.
-
-	HTTPServerRequest& request();
-		/// Returns the request.
-
-	HTTPServerResponse& response();
-		/// Returns the response.
-
-	HTMLForm& form();
-		/// Returns a HTMLForm for the given request.
-		/// The HTMLForm object is created when this
-		/// member function is executed the first time.
-
-	void sendErrorResponse(HTTPResponse::HTTPStatus status, const std::string& message);
-		/// Sends a HTML error page for the given status code.
-		/// The given message is added to the page:
-		///     <HTML>
-		///         <HEAD>
-		///             <TITLE>status - reason</TITLE>
-		///         </HEAD>
-		///         <BODY>
-		///            <H1>status - reason</H1>
-		///            <P>message</P>
-		///         </BODY>
-		///     </HTML>
-	
-protected:
-	virtual void run() = 0;
-		/// Must be overridden by subclasses.
-		///
-		/// Handles the given request.
-
-	virtual bool authenticate();
-		/// Check authentication; returns true if okay, false if failed to authenticate.
-		/// The default implementation always returns true.
-		///
-		/// Subclasses can override this member function to perform
-		/// some form of client or request authentication before
-		/// the request is actually handled.
-
-private:
-	HTTPServerRequest*  _pRequest;
-	HTTPServerResponse* _pResponse;
-	HTMLForm*           _pForm;
-};
-
-
-//
-// inlines
-//
-inline HTTPServerRequest& AbstractHTTPRequestHandler::request()
-{
-	poco_check_ptr (_pRequest);
-	
-	return *_pRequest;
-}
-
-
-inline HTTPServerResponse& AbstractHTTPRequestHandler::response()
-{
-	poco_check_ptr (_pResponse);
-
-	return *_pResponse;
-}
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_AbstractHTTPRequestHandler_INCLUDED
+//
+// AbstractHTTPRequestHandler.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/AbstractHTTPRequestHandler.h#2 $
+//
+// Library: Net
+// Package: HTTPServer
+// Module:  AbstractHTTPRequestHandler
+//
+// Definition of the AbstractHTTPRequestHandler class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_AbstractHTTPRequestHandler_INCLUDED
+#define Net_AbstractHTTPRequestHandler_INCLUDED
+
+
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPResponse.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+class HTMLForm;
+
+
+class Net_API AbstractHTTPRequestHandler: public HTTPRequestHandler
+	/// The abstract base class for AbstractHTTPRequestHandlers 
+	/// created by HTTPServer.
+	///
+	/// Derived classes must override the run() method.
+
+	/// Contrary to a HTTPRequestHandler, an AbstractHTTPRequestHandler
+	/// stores request and response as member variables to avoid having
+	/// to pass them around as method parameters. Additionally, a
+	/// HTMLForm object is created for use by subclasses.
+	///
+	/// The run() method must perform the complete handling
+	/// of the HTTP request connection. As soon as the run() 
+	/// method returns, the request handler object is destroyed.
+	///
+	/// A new AbstractHTTPRequestHandler object will be created for
+	/// each new HTTP request that is received by the HTTPServer.
+{
+public:
+	AbstractHTTPRequestHandler();
+		/// Creates the AbstractHTTPRequestHandler.
+
+	virtual ~AbstractHTTPRequestHandler();
+		/// Destroys the AbstractHTTPRequestHandler.
+
+	void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response);
+		/// This class implements some common behavior,
+		/// before calling run() to actually handle the request:
+		///   - save request and response objects;
+		///   - call authorize();
+		///   - if authorize() returns true call run(),
+		///     else send 401 (Unauthorized) response.
+		///
+		/// If run() throws an exception and the response has not been
+		/// sent yet, sends a 500 (Internal Server Error) response with
+		/// the exception's display text.
+
+	HTTPServerRequest& request();
+		/// Returns the request.
+
+	HTTPServerResponse& response();
+		/// Returns the response.
+
+	HTMLForm& form();
+		/// Returns a HTMLForm for the given request.
+		/// The HTMLForm object is created when this
+		/// member function is executed the first time.
+
+	void sendErrorResponse(HTTPResponse::HTTPStatus status, const std::string& message);
+		/// Sends a HTML error page for the given status code.
+		/// The given message is added to the page:
+		///     <HTML>
+		///         <HEAD>
+		///             <TITLE>status - reason</TITLE>
+		///         </HEAD>
+		///         <BODY>
+		///            <H1>status - reason</H1>
+		///            <P>message</P>
+		///         </BODY>
+		///     </HTML>
+	
+protected:
+	virtual void run() = 0;
+		/// Must be overridden by subclasses.
+		///
+		/// Handles the given request.
+
+	virtual bool authenticate();
+		/// Check authentication; returns true if okay, false if failed to authenticate.
+		/// The default implementation always returns true.
+		///
+		/// Subclasses can override this member function to perform
+		/// some form of client or request authentication before
+		/// the request is actually handled.
+
+private:
+	HTTPServerRequest*  _pRequest;
+	HTTPServerResponse* _pResponse;
+	HTMLForm*           _pForm;
+};
+
+
+//
+// inlines
+//
+inline HTTPServerRequest& AbstractHTTPRequestHandler::request()
+{
+	poco_check_ptr (_pRequest);
+	
+	return *_pRequest;
+}
+
+
+inline HTTPServerResponse& AbstractHTTPRequestHandler::response()
+{
+	poco_check_ptr (_pResponse);
+
+	return *_pResponse;
+}
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_AbstractHTTPRequestHandler_INCLUDED
diff --git a/Net/include/Poco/Net/AsyncSocketChannel.h b/Net/include/Poco/Net/AsyncSocketChannel.h
index b8d75463c..a24b14fd1 100644
--- a/Net/include/Poco/Net/AsyncSocketChannel.h
+++ b/Net/include/Poco/Net/AsyncSocketChannel.h
@@ -1,84 +1,84 @@
-//
-// AsyncSocketChannel.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/AsyncSocketChannel.h#2 $
-//
-// Library: Net
-// Package: AsyncIO
-// Module:  AsyncSocketChannel
-//
-// Definition of the AsyncSocketChannel class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_AsyncSocketChannel_INCLUDED
-#define Net_AsyncSocketChannel_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "Poco/Net/StreamSocket.h"
-#include "Poco/AsyncIOChannel.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-class Net_API AsyncSocketChannel: public Poco::AsyncIOChannel
-	/// AsyncSocketChannel provides an AsyncIOChannel for a StreamSocket.
-	///
-	/// Usage Example:
-	///     StreamSocket socket(...);
-	///     AsyncSocketChannel channel(socket);
-	///     channel.enqueue(new AsyncWriteCommand("Hello", 5));
-	///     channel.enqueue(new AsyncWriteCommand(", ", 2));
-	///     ActiveResult<int> result = channel.enqueue(new AsyncWriteCommand("world!", 6));
-	///     result.wait();
-{
-public:
-	AsyncSocketChannel(const StreamSocket& socket);
-		/// Creates an AsyncSocketChannel using the given StreamSocket.
-		
-	~AsyncSocketChannel();
-		/// Destroys the AsyncSocketChannel.
-	
-	// AsyncIOChannel
-	int write(const void* buffer, int length);
-	int read(void* buffer, int length);
-			
-private:
-	AsyncSocketChannel();
-	
-	StreamSocket _socket;
-};
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_AsyncSocketChannel_INCLUDED
+//
+// AsyncSocketChannel.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/AsyncSocketChannel.h#2 $
+//
+// Library: Net
+// Package: AsyncIO
+// Module:  AsyncSocketChannel
+//
+// Definition of the AsyncSocketChannel class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_AsyncSocketChannel_INCLUDED
+#define Net_AsyncSocketChannel_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "Poco/Net/StreamSocket.h"
+#include "Poco/AsyncIOChannel.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+class Net_API AsyncSocketChannel: public Poco::AsyncIOChannel
+	/// AsyncSocketChannel provides an AsyncIOChannel for a StreamSocket.
+	///
+	/// Usage Example:
+	///     StreamSocket socket(...);
+	///     AsyncSocketChannel channel(socket);
+	///     channel.enqueue(new AsyncWriteCommand("Hello", 5));
+	///     channel.enqueue(new AsyncWriteCommand(", ", 2));
+	///     ActiveResult<int> result = channel.enqueue(new AsyncWriteCommand("world!", 6));
+	///     result.wait();
+{
+public:
+	AsyncSocketChannel(const StreamSocket& socket);
+		/// Creates an AsyncSocketChannel using the given StreamSocket.
+		
+	~AsyncSocketChannel();
+		/// Destroys the AsyncSocketChannel.
+	
+	// AsyncIOChannel
+	int write(const void* buffer, int length);
+	int read(void* buffer, int length);
+			
+private:
+	AsyncSocketChannel();
+	
+	StreamSocket _socket;
+};
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_AsyncSocketChannel_INCLUDED
diff --git a/Net/include/Poco/Net/HTTPServerRequestImpl.h b/Net/include/Poco/Net/HTTPServerRequestImpl.h
index 8053a3204..401784d65 100644
--- a/Net/include/Poco/Net/HTTPServerRequestImpl.h
+++ b/Net/include/Poco/Net/HTTPServerRequestImpl.h
@@ -1,142 +1,142 @@
-//
-// HTTPServerRequestImpl.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/HTTPServerRequestImpl.h#2 $
-//
-// Library: Net
-// Package: HTTPServer
-// Module:  HTTPServerRequestImpl
-//
-// Definition of the HTTPServerRequestImpl class.
-//
-// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_HTTPServerRequestImpl_INCLUDED
-#define Net_HTTPServerRequestImpl_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "Poco/Net/HTTPServerRequest.h"
-#include "Poco/Net/SocketAddress.h"
-#include <istream>
-
-
-namespace Poco {
-namespace Net {
-
-
-class HTTPServerSession;
-class HTTPServerParams;
-
-
-class Net_API HTTPServerRequestImpl: public HTTPServerRequest
-	/// This subclass of HTTPServerRequest is used for
-	/// representing server-side HTTP requests.
-	///
-	/// A HTTPServerRequest is passed to the
-	/// handleRequest() method of HTTPRequestHandler.
-{
-public:
-	HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams);
-		/// Creates the HTTPServerRequestImpl, using the
-		/// given HTTPServerSession.
-
-	~HTTPServerRequestImpl();
-		/// Destroys the HTTPServerRequestImpl.
-		
-	std::istream& stream();
-		/// Returns the input stream for reading
-		/// the request body.
-		///
-		/// The stream is valid until the HTTPServerRequestImpl
-		/// object is destroyed.
-		
-	bool expectContinue() const;
-		/// Returns true if the client expects a
-		/// 100 Continue response.
-		
-	const SocketAddress& clientAddress() const;
-		/// Returns the client's address.
-
-	const SocketAddress& serverAddress() const;
-		/// Returns the server's address.
-		
-	const HTTPServerParams& serverParams() const;
-		/// Returns a reference to the server parameters.
-
-	HTTPServerResponse& response() const;
-		/// Returns a reference to the associated response.
-
-private:
-	HTTPServerResponse& _response;
-	std::istream*       _pStream;
-	HTTPServerParams*   _pParams;
-	SocketAddress       _clientAddress;
-	SocketAddress       _serverAddress;
-};
-
-
-//
-// inlines
-//
-inline std::istream& HTTPServerRequestImpl::stream()
-{
-	poco_check_ptr (_pStream);
-	
-	return *_pStream;
-}
-
-
-inline const SocketAddress& HTTPServerRequestImpl::clientAddress() const
-{
-	return _clientAddress;
-}
-
-
-inline const SocketAddress& HTTPServerRequestImpl::serverAddress() const
-{
-	return _serverAddress;
-}
-
-
-inline const HTTPServerParams& HTTPServerRequestImpl::serverParams() const
-{
-	return *_pParams;
-}
-
-
-inline HTTPServerResponse& HTTPServerRequestImpl::response() const
-{
-	return _response;
-}
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_HTTPServerRequestImpl_INCLUDED
+//
+// HTTPServerRequestImpl.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/HTTPServerRequestImpl.h#2 $
+//
+// Library: Net
+// Package: HTTPServer
+// Module:  HTTPServerRequestImpl
+//
+// Definition of the HTTPServerRequestImpl class.
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_HTTPServerRequestImpl_INCLUDED
+#define Net_HTTPServerRequestImpl_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/SocketAddress.h"
+#include <istream>
+
+
+namespace Poco {
+namespace Net {
+
+
+class HTTPServerSession;
+class HTTPServerParams;
+
+
+class Net_API HTTPServerRequestImpl: public HTTPServerRequest
+	/// This subclass of HTTPServerRequest is used for
+	/// representing server-side HTTP requests.
+	///
+	/// A HTTPServerRequest is passed to the
+	/// handleRequest() method of HTTPRequestHandler.
+{
+public:
+	HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams);
+		/// Creates the HTTPServerRequestImpl, using the
+		/// given HTTPServerSession.
+
+	~HTTPServerRequestImpl();
+		/// Destroys the HTTPServerRequestImpl.
+		
+	std::istream& stream();
+		/// Returns the input stream for reading
+		/// the request body.
+		///
+		/// The stream is valid until the HTTPServerRequestImpl
+		/// object is destroyed.
+		
+	bool expectContinue() const;
+		/// Returns true if the client expects a
+		/// 100 Continue response.
+		
+	const SocketAddress& clientAddress() const;
+		/// Returns the client's address.
+
+	const SocketAddress& serverAddress() const;
+		/// Returns the server's address.
+		
+	const HTTPServerParams& serverParams() const;
+		/// Returns a reference to the server parameters.
+
+	HTTPServerResponse& response() const;
+		/// Returns a reference to the associated response.
+
+private:
+	HTTPServerResponse& _response;
+	std::istream*       _pStream;
+	HTTPServerParams*   _pParams;
+	SocketAddress       _clientAddress;
+	SocketAddress       _serverAddress;
+};
+
+
+//
+// inlines
+//
+inline std::istream& HTTPServerRequestImpl::stream()
+{
+	poco_check_ptr (_pStream);
+	
+	return *_pStream;
+}
+
+
+inline const SocketAddress& HTTPServerRequestImpl::clientAddress() const
+{
+	return _clientAddress;
+}
+
+
+inline const SocketAddress& HTTPServerRequestImpl::serverAddress() const
+{
+	return _serverAddress;
+}
+
+
+inline const HTTPServerParams& HTTPServerRequestImpl::serverParams() const
+{
+	return *_pParams;
+}
+
+
+inline HTTPServerResponse& HTTPServerRequestImpl::response() const
+{
+	return _response;
+}
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_HTTPServerRequestImpl_INCLUDED
diff --git a/Net/include/Poco/Net/HTTPServerResponseImpl.h b/Net/include/Poco/Net/HTTPServerResponseImpl.h
index 828ae72d5..893fb7597 100644
--- a/Net/include/Poco/Net/HTTPServerResponseImpl.h
+++ b/Net/include/Poco/Net/HTTPServerResponseImpl.h
@@ -1,147 +1,147 @@
-//
-// HTTPServerResponseImpl.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/HTTPServerResponseImpl.h#2 $
-//
-// Library: Net
-// Package: HTTPServer
-// Module:  HTTPServerResponseImpl
-//
-// Definition of the HTTPServerResponseImpl class.
-//
-// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_HTTPServerResponseImpl_INCLUDED
-#define Net_HTTPServerResponseImpl_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "Poco/Net/HTTPServerResponse.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-class HTTPServerSession;
-class HTTPCookie;
-
-
-class Net_API HTTPServerResponseImpl: public HTTPServerResponse
-	/// This subclass of HTTPServerResponse is used for
-	/// representing server-side HTTP responses.
-	///
-	/// A HTTPServerResponse is passed to the
-	/// handleRequest() method of HTTPRequestHandler.
-	///
-	/// handleRequest() must set a status code
-	/// and optional reason phrase, set headers
-	/// as necessary, and provide a message body.
-{
-public:
-	HTTPServerResponseImpl(HTTPServerSession& session);
-		/// Creates the HTTPServerResponseImpl.
-
-	~HTTPServerResponseImpl();
-		/// Destroys the HTTPServerResponseImpl.
-
-	void sendContinue();
-		/// Sends a 100 Continue response to the
-		/// client.
-		
-	std::ostream& send();
-		/// Sends the response header to the client and
-		/// returns an output stream for sending the
-		/// response body.
-		///
-		/// The returned stream is valid until the response
-		/// object is destroyed.
-		///
-		/// Must not be called after sendFile(), sendBuffer() 
-		/// or redirect() has been called.
-		
-	void sendFile(const std::string& path, const std::string& mediaType);
-		/// Sends the response header to the client, followed
-		/// by the content of the given file.
-		///
-		/// Must not be called after send(), sendBuffer() 
-		/// or redirect() has been called.
-		///
-		/// Throws a FileNotFoundException if the file
-		/// cannot be found, or an OpenFileException if
-		/// the file cannot be opened.
-		
-	void sendBuffer(const void* pBuffer, std::size_t length);
-		/// Sends the response header to the client, followed
-		/// by the contents of the given buffer.
-		///
-		/// The Content-Length header of the response is set
-		/// to length and chunked transfer encoding is disabled.
-		///
-		/// If both the HTTP message header and body (from the
-		/// given buffer) fit into one single network packet, the 
-		/// complete response can be sent in one network packet.
-		///
-		/// Must not be called after send(), sendFile()  
-		/// or redirect() has been called.
-		
-	void redirect(const std::string& uri);
-		/// Sets the status code to 302 (Found)
-		/// and sets the "Location" header field
-		/// to the given URI, which according to
-		/// the HTTP specification, must be absolute.
-		///
-		/// Must not be called after send() has been called.
-		
-	void requireAuthentication(const std::string& realm);
-		/// Sets the status code to 401 (Unauthorized)
-		/// and sets the "WWW-Authenticate" header field
-		/// according to the given realm.
-		
-	bool sent() const;
-		/// Returns true if the response (header) has been sent.
-
-private:
-	HTTPServerSession& _session;
-	std::ostream*      _pStream;
-};
-
-
-//
-// inlines
-//
-inline bool HTTPServerResponseImpl::sent() const
-{
-	return _pStream != 0;
-}
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_HTTPServerResponseImpl_INCLUDED
+//
+// HTTPServerResponseImpl.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/HTTPServerResponseImpl.h#2 $
+//
+// Library: Net
+// Package: HTTPServer
+// Module:  HTTPServerResponseImpl
+//
+// Definition of the HTTPServerResponseImpl class.
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_HTTPServerResponseImpl_INCLUDED
+#define Net_HTTPServerResponseImpl_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "Poco/Net/HTTPServerResponse.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+class HTTPServerSession;
+class HTTPCookie;
+
+
+class Net_API HTTPServerResponseImpl: public HTTPServerResponse
+	/// This subclass of HTTPServerResponse is used for
+	/// representing server-side HTTP responses.
+	///
+	/// A HTTPServerResponse is passed to the
+	/// handleRequest() method of HTTPRequestHandler.
+	///
+	/// handleRequest() must set a status code
+	/// and optional reason phrase, set headers
+	/// as necessary, and provide a message body.
+{
+public:
+	HTTPServerResponseImpl(HTTPServerSession& session);
+		/// Creates the HTTPServerResponseImpl.
+
+	~HTTPServerResponseImpl();
+		/// Destroys the HTTPServerResponseImpl.
+
+	void sendContinue();
+		/// Sends a 100 Continue response to the
+		/// client.
+		
+	std::ostream& send();
+		/// Sends the response header to the client and
+		/// returns an output stream for sending the
+		/// response body.
+		///
+		/// The returned stream is valid until the response
+		/// object is destroyed.
+		///
+		/// Must not be called after sendFile(), sendBuffer() 
+		/// or redirect() has been called.
+		
+	void sendFile(const std::string& path, const std::string& mediaType);
+		/// Sends the response header to the client, followed
+		/// by the content of the given file.
+		///
+		/// Must not be called after send(), sendBuffer() 
+		/// or redirect() has been called.
+		///
+		/// Throws a FileNotFoundException if the file
+		/// cannot be found, or an OpenFileException if
+		/// the file cannot be opened.
+		
+	void sendBuffer(const void* pBuffer, std::size_t length);
+		/// Sends the response header to the client, followed
+		/// by the contents of the given buffer.
+		///
+		/// The Content-Length header of the response is set
+		/// to length and chunked transfer encoding is disabled.
+		///
+		/// If both the HTTP message header and body (from the
+		/// given buffer) fit into one single network packet, the 
+		/// complete response can be sent in one network packet.
+		///
+		/// Must not be called after send(), sendFile()  
+		/// or redirect() has been called.
+		
+	void redirect(const std::string& uri);
+		/// Sets the status code to 302 (Found)
+		/// and sets the "Location" header field
+		/// to the given URI, which according to
+		/// the HTTP specification, must be absolute.
+		///
+		/// Must not be called after send() has been called.
+		
+	void requireAuthentication(const std::string& realm);
+		/// Sets the status code to 401 (Unauthorized)
+		/// and sets the "WWW-Authenticate" header field
+		/// according to the given realm.
+		
+	bool sent() const;
+		/// Returns true if the response (header) has been sent.
+
+private:
+	HTTPServerSession& _session;
+	std::ostream*      _pStream;
+};
+
+
+//
+// inlines
+//
+inline bool HTTPServerResponseImpl::sent() const
+{
+	return _pStream != 0;
+}
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_HTTPServerResponseImpl_INCLUDED
diff --git a/Net/include/Poco/Net/RemoteSyslogChannel.h b/Net/include/Poco/Net/RemoteSyslogChannel.h
index 0cae2f7d1..70d2a1acc 100644
--- a/Net/include/Poco/Net/RemoteSyslogChannel.h
+++ b/Net/include/Poco/Net/RemoteSyslogChannel.h
@@ -1,169 +1,169 @@
-//
-// RemoteSyslogChannel.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/RemoteSyslogChannel.h#2 $
-//
-// Library: Net
-// Package: Logging
-// Module:  RemoteSyslogChannel
-//
-// Definition of the RemoteSyslogChannel class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_RemoteSyslogChannel_INCLUDED
-#define Net_RemoteSyslogChannel_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "Poco/Channel.h"
-#include "Poco/Net/DatagramSocket.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-class Net_API RemoteSyslogChannel: public Poco::Channel
-	/// This Channel implements remote syslog logging over UDP according
-	/// to the syslog Working Group Internet Draft:
-	/// "The syslog Protocol" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-protocol-17.txt>, 
-	/// and "Transmission of syslog messages over UDP" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-transport-udp-07.txt>.
-	///
-	/// In addition, RemoteSyslogChannel also supports the "old" BSD syslog
-	/// protocol, as described in RFC 3164.
-{
-public:
-	static const std::string BSD_TIMEFORMAT;
-	static const std::string SYSLOG_TIMEFORMAT;
-
-	enum Severity
-	{
-		SYSLOG_EMERGENCY     = 0, /// Emergency: system is unusable
-		SYSLOG_ALERT         = 1, /// Alert: action must be taken immediately
-		SYSLOG_CRITICAL      = 2, /// Critical: critical conditions
-		SYSLOG_ERROR         = 3, /// Error: error conditions
-		SYSLOG_WARNING       = 4, /// Warning: warning conditions
-		SYSLOG_NOTICE        = 5, /// Notice: normal but significant condition
-		SYSLOG_INFORMATIONAL = 6, /// Informational: informational messages
-		SYSLOG_DEBUG         = 7  /// Debug: debug-level messages
-	};
-	
-	enum Facility
-	{
-		SYSLOG_KERN     = ( 0<<3), /// kernel messages
-		SYSLOG_USER     = ( 1<<3), /// random user-level messages
-		SYSLOG_MAIL     = ( 2<<3), /// mail system
-		SYSLOG_DAEMON   = ( 3<<3), /// system daemons
-		SYSLOG_AUTH     = ( 4<<3), /// security/authorization messages
-		SYSLOG_SYSLOG   = ( 5<<3), /// messages generated internally by syslogd
-		SYSLOG_LPR      = ( 6<<3), /// line printer subsystem
-		SYSLOG_NEWS     = ( 7<<3), /// network news subsystem
-		SYSLOG_UUCP     = ( 8<<3), /// UUCP subsystem
-		SYSLOG_CRON     = ( 9<<3), /// clock daemon
-		SYSLOG_AUTHPRIV = (10<<3), /// security/authorization messages (private)
-		SYSLOG_FTP      = (11<<3), /// ftp daemon
-		SYSLOG_NTP      = (12<<3), /// ntp subsystem
-		SYSLOG_LOGAUDIT = (13<<3), /// log audit
-		SYSLOG_LOGALERT = (14<<3), /// log alert
-		SYSLOG_CLOCK    = (15<<3), /// clock deamon
-		SYSLOG_LOCAL0   = (16<<3), /// reserved for local use
-		SYSLOG_LOCAL1   = (17<<3), /// reserved for local use
-		SYSLOG_LOCAL2   = (18<<3), /// reserved for local use
-		SYSLOG_LOCAL3   = (19<<3), /// reserved for local use
-		SYSLOG_LOCAL4   = (20<<3), /// reserved for local use
-		SYSLOG_LOCAL5   = (21<<3), /// reserved for local use
-		SYSLOG_LOCAL6   = (22<<3), /// reserved for local use
-		SYSLOG_LOCAL7   = (23<<3)  /// reserved for local use
-	};
-	
-	enum
-	{
-		SYSLOG_PORT = 514
-	};
-	
-	RemoteSyslogChannel();
-		/// Creates a RemoteSyslogChannel.
-		
-	RemoteSyslogChannel(const std::string& address, const std::string& name, int facility = SYSLOG_USER, bool bsdFormat = false);
-		/// Creates a RemoteSyslogChannel with the given target address, name, and facility.
-		/// If bsdFormat is true, messages are formatted according to RFC 3164.
-	
-	void open();
-		/// Opens the RemoteSyslogChannel.
-		
-	void close();
-		/// Closes the RemoteSyslogChannel.
-		
-	void log(const Message& msg);
-		/// Sends the message's text to the syslog service.
-		
-	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given value.
-		///
-		/// The following properties are supported:
-		///     * name:      The name used to identify the source of log messages.
-		///     * facility:  The facility added to each log message. See the Facility enumeration for a list of supported values.
-		///                  The LOG_ prefix can be omitted and values are case insensitive (e.g. a facility value "mail" is recognized as SYSLOG_MAIL)
-		///     * format:    "bsd" (RFC 3164 format) or "new" (default)
-		///     * loghost:   The target IP address or host name where log messages are sent. Optionally, a port number (separated
-		///                  by a colon) can also be specified.
-		///     * host:      (optional) Host name included in syslog messages. If not specified, the host's real domain name or
-		///                  IP address will be used.
-		
-	std::string getProperty(const std::string& name) const;
-		/// Returns the value of the property with the given name.
-
-	static void registerChannel();
-		/// Registers the channel with the global LoggingFactory.
-
-	static const std::string PROP_NAME;
-	static const std::string PROP_FACILITY;
-	static const std::string PROP_FORMAT;
-	static const std::string PROP_LOGHOST;
-	static const std::string PROP_HOST;
-
-protected:
-	~RemoteSyslogChannel();
-	static int getPrio(const Message& msg);
-
-private:
-	std::string _logHost;
-	std::string _name;
-	std::string _host;
-	int  _facility;
-	bool _bsdFormat;
-	DatagramSocket _socket;
-	bool _open;
-};
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_RemoteSyslogChannel_INCLUDED
+//
+// RemoteSyslogChannel.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/RemoteSyslogChannel.h#2 $
+//
+// Library: Net
+// Package: Logging
+// Module:  RemoteSyslogChannel
+//
+// Definition of the RemoteSyslogChannel class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_RemoteSyslogChannel_INCLUDED
+#define Net_RemoteSyslogChannel_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "Poco/Channel.h"
+#include "Poco/Net/DatagramSocket.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+class Net_API RemoteSyslogChannel: public Poco::Channel
+	/// This Channel implements remote syslog logging over UDP according
+	/// to the syslog Working Group Internet Draft:
+	/// "The syslog Protocol" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-protocol-17.txt>, 
+	/// and "Transmission of syslog messages over UDP" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-transport-udp-07.txt>.
+	///
+	/// In addition, RemoteSyslogChannel also supports the "old" BSD syslog
+	/// protocol, as described in RFC 3164.
+{
+public:
+	static const std::string BSD_TIMEFORMAT;
+	static const std::string SYSLOG_TIMEFORMAT;
+
+	enum Severity
+	{
+		SYSLOG_EMERGENCY     = 0, /// Emergency: system is unusable
+		SYSLOG_ALERT         = 1, /// Alert: action must be taken immediately
+		SYSLOG_CRITICAL      = 2, /// Critical: critical conditions
+		SYSLOG_ERROR         = 3, /// Error: error conditions
+		SYSLOG_WARNING       = 4, /// Warning: warning conditions
+		SYSLOG_NOTICE        = 5, /// Notice: normal but significant condition
+		SYSLOG_INFORMATIONAL = 6, /// Informational: informational messages
+		SYSLOG_DEBUG         = 7  /// Debug: debug-level messages
+	};
+	
+	enum Facility
+	{
+		SYSLOG_KERN     = ( 0<<3), /// kernel messages
+		SYSLOG_USER     = ( 1<<3), /// random user-level messages
+		SYSLOG_MAIL     = ( 2<<3), /// mail system
+		SYSLOG_DAEMON   = ( 3<<3), /// system daemons
+		SYSLOG_AUTH     = ( 4<<3), /// security/authorization messages
+		SYSLOG_SYSLOG   = ( 5<<3), /// messages generated internally by syslogd
+		SYSLOG_LPR      = ( 6<<3), /// line printer subsystem
+		SYSLOG_NEWS     = ( 7<<3), /// network news subsystem
+		SYSLOG_UUCP     = ( 8<<3), /// UUCP subsystem
+		SYSLOG_CRON     = ( 9<<3), /// clock daemon
+		SYSLOG_AUTHPRIV = (10<<3), /// security/authorization messages (private)
+		SYSLOG_FTP      = (11<<3), /// ftp daemon
+		SYSLOG_NTP      = (12<<3), /// ntp subsystem
+		SYSLOG_LOGAUDIT = (13<<3), /// log audit
+		SYSLOG_LOGALERT = (14<<3), /// log alert
+		SYSLOG_CLOCK    = (15<<3), /// clock deamon
+		SYSLOG_LOCAL0   = (16<<3), /// reserved for local use
+		SYSLOG_LOCAL1   = (17<<3), /// reserved for local use
+		SYSLOG_LOCAL2   = (18<<3), /// reserved for local use
+		SYSLOG_LOCAL3   = (19<<3), /// reserved for local use
+		SYSLOG_LOCAL4   = (20<<3), /// reserved for local use
+		SYSLOG_LOCAL5   = (21<<3), /// reserved for local use
+		SYSLOG_LOCAL6   = (22<<3), /// reserved for local use
+		SYSLOG_LOCAL7   = (23<<3)  /// reserved for local use
+	};
+	
+	enum
+	{
+		SYSLOG_PORT = 514
+	};
+	
+	RemoteSyslogChannel();
+		/// Creates a RemoteSyslogChannel.
+		
+	RemoteSyslogChannel(const std::string& address, const std::string& name, int facility = SYSLOG_USER, bool bsdFormat = false);
+		/// Creates a RemoteSyslogChannel with the given target address, name, and facility.
+		/// If bsdFormat is true, messages are formatted according to RFC 3164.
+	
+	void open();
+		/// Opens the RemoteSyslogChannel.
+		
+	void close();
+		/// Closes the RemoteSyslogChannel.
+		
+	void log(const Message& msg);
+		/// Sends the message's text to the syslog service.
+		
+	void setProperty(const std::string& name, const std::string& value);
+		/// Sets the property with the given value.
+		///
+		/// The following properties are supported:
+		///     * name:      The name used to identify the source of log messages.
+		///     * facility:  The facility added to each log message. See the Facility enumeration for a list of supported values.
+		///                  The LOG_ prefix can be omitted and values are case insensitive (e.g. a facility value "mail" is recognized as SYSLOG_MAIL)
+		///     * format:    "bsd" (RFC 3164 format) or "new" (default)
+		///     * loghost:   The target IP address or host name where log messages are sent. Optionally, a port number (separated
+		///                  by a colon) can also be specified.
+		///     * host:      (optional) Host name included in syslog messages. If not specified, the host's real domain name or
+		///                  IP address will be used.
+		
+	std::string getProperty(const std::string& name) const;
+		/// Returns the value of the property with the given name.
+
+	static void registerChannel();
+		/// Registers the channel with the global LoggingFactory.
+
+	static const std::string PROP_NAME;
+	static const std::string PROP_FACILITY;
+	static const std::string PROP_FORMAT;
+	static const std::string PROP_LOGHOST;
+	static const std::string PROP_HOST;
+
+protected:
+	~RemoteSyslogChannel();
+	static int getPrio(const Message& msg);
+
+private:
+	std::string _logHost;
+	std::string _name;
+	std::string _host;
+	int  _facility;
+	bool _bsdFormat;
+	DatagramSocket _socket;
+	bool _open;
+};
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_RemoteSyslogChannel_INCLUDED
diff --git a/Net/include/Poco/Net/RemoteSyslogListener.h b/Net/include/Poco/Net/RemoteSyslogListener.h
index 1e95a9185..fe35cc688 100644
--- a/Net/include/Poco/Net/RemoteSyslogListener.h
+++ b/Net/include/Poco/Net/RemoteSyslogListener.h
@@ -1,114 +1,114 @@
-//
-// RemoteSyslogListener.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/RemoteSyslogListener.h#2 $
-//
-// Library: Net
-// Package: Logging
-// Module:  RemoteSyslogListener
-//
-// Definition of the RemoteSyslogListener class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_RemoteSyslogListener_INCLUDED
-#define Net_RemoteSyslogListener_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "Poco/Thread.h"
-#include "Poco/SplitterChannel.h"
-#include "Poco/NotificationQueue.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-class RemoteUDPListener;
-class SyslogParser;
-
-
-class Net_API RemoteSyslogListener: public Poco::SplitterChannel
-	/// RemoteSyslogListener implents listening for syslog messages
-	/// sent over UDP, according to the syslog Working Group Internet Draft:
-	/// "The syslog Protocol" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-protocol-17.txt>, 
-	/// and "Transmission of syslog messages over UDP" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-transport-udp-07.txt>.
-	///
-	/// In addition, RemoteSyslogListener also supports the "old" BSD syslog
-	/// protocol, as described in RFC 3164.
-	///
-	/// The RemoteSyslogListener is a subclass of Poco::SplitterChannel.
-	/// Every received log message is sent to the channels registered
-	/// with addChannel() or the "channel" property.
-{
-public:
-	RemoteSyslogListener();
-		/// Creates the RemoteSyslogListener.
-
-	RemoteSyslogListener(Poco::UInt16 port);
-		/// Creates the RemoteSyslogListener.
-
-	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given value.
-		///
-		/// The following properties are supported:
-		///     * port: The UDP port number where to listen for UDP.
-		
-	std::string getProperty(const std::string& name) const;
-		/// Returns the value of the property with the given name.
-
-	void open();
-		/// Starts the listener.
-
-	void close();
-		/// Stops the listener.
-
-	static void registerChannel();
-		/// Registers the channel with the global LoggingFactory.
-
-	static const std::string PROP_PORT;
-
-protected:
-	~RemoteSyslogListener();
-		/// Destroys the RemoteSyslogListener.
-
-private:
-	RemoteUDPListener*      _pListener;
-	SyslogParser*           _pParser;
-	Poco::Thread            _listener;
-	Poco::Thread            _parser;
-	Poco::NotificationQueue _queue;
-	Poco::UInt16            _port;
-};
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_RemoteSyslogListener_INCLUDED
+//
+// RemoteSyslogListener.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/RemoteSyslogListener.h#2 $
+//
+// Library: Net
+// Package: Logging
+// Module:  RemoteSyslogListener
+//
+// Definition of the RemoteSyslogListener class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_RemoteSyslogListener_INCLUDED
+#define Net_RemoteSyslogListener_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "Poco/Thread.h"
+#include "Poco/SplitterChannel.h"
+#include "Poco/NotificationQueue.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+class RemoteUDPListener;
+class SyslogParser;
+
+
+class Net_API RemoteSyslogListener: public Poco::SplitterChannel
+	/// RemoteSyslogListener implents listening for syslog messages
+	/// sent over UDP, according to the syslog Working Group Internet Draft:
+	/// "The syslog Protocol" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-protocol-17.txt>, 
+	/// and "Transmission of syslog messages over UDP" <http://www.ietf.org/internet-drafts/draft-ietf-syslog-transport-udp-07.txt>.
+	///
+	/// In addition, RemoteSyslogListener also supports the "old" BSD syslog
+	/// protocol, as described in RFC 3164.
+	///
+	/// The RemoteSyslogListener is a subclass of Poco::SplitterChannel.
+	/// Every received log message is sent to the channels registered
+	/// with addChannel() or the "channel" property.
+{
+public:
+	RemoteSyslogListener();
+		/// Creates the RemoteSyslogListener.
+
+	RemoteSyslogListener(Poco::UInt16 port);
+		/// Creates the RemoteSyslogListener.
+
+	void setProperty(const std::string& name, const std::string& value);
+		/// Sets the property with the given value.
+		///
+		/// The following properties are supported:
+		///     * port: The UDP port number where to listen for UDP.
+		
+	std::string getProperty(const std::string& name) const;
+		/// Returns the value of the property with the given name.
+
+	void open();
+		/// Starts the listener.
+
+	void close();
+		/// Stops the listener.
+
+	static void registerChannel();
+		/// Registers the channel with the global LoggingFactory.
+
+	static const std::string PROP_PORT;
+
+protected:
+	~RemoteSyslogListener();
+		/// Destroys the RemoteSyslogListener.
+
+private:
+	RemoteUDPListener*      _pListener;
+	SyslogParser*           _pParser;
+	Poco::Thread            _listener;
+	Poco::Thread            _parser;
+	Poco::NotificationQueue _queue;
+	Poco::UInt16            _port;
+};
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_RemoteSyslogListener_INCLUDED
diff --git a/Net/include/Poco/Net/SMTPChannel.h b/Net/include/Poco/Net/SMTPChannel.h
index 4ef677ddc..8d4c4c7df 100644
--- a/Net/include/Poco/Net/SMTPChannel.h
+++ b/Net/include/Poco/Net/SMTPChannel.h
@@ -1,130 +1,130 @@
-//
-// SMTPChannel.h
-//
-// $Id: //poco/svn/Net/include/Poco/Net/SMTPChannel.h#1 $
-//
-// Library: Net
-// Package: Logging
-// Module:  SMTPChannel
-//
-// Definition of the SMTPChannel class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef Net_SMTPChannel_INCLUDED
-#define Net_SMTPChannel_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "Poco/Channel.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-class Net_API SMTPChannel: public Poco::Channel
-	/// This Channel implements SMTP (email) logging.
-{
-public:
-	SMTPChannel();
-		/// Creates a SMTPChannel.
-		
-	SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient);
-		/// Creates a SMTPChannel with the given target mailhost, sender, and recipient.
-	
-	void open();
-		/// Opens the SMTPChannel.
-		
-	void close();
-		/// Closes the SMTPChannel.
-		
-	void log(const Message& msg);
-		/// Sends the message's text to the recipient.
-		
-	void setProperty(const std::string& name, const std::string& value);
-		/// Sets the property with the given value.
-		///
-		/// The following properties are supported:
-		///     * mailhost:   The SMTP server. Default is "localhost".
-		///     * sender:     The sender address.
-		///     * recipient:  The recipient address.
-		///     * local:      If true, local time is used. Default is true.
-		///     * attachment: Filename of the file to attach.
-		///     * type:       Content type of the file to attach.
-		///     * delete:     Boolean value indicating whether to delete 
-		///                   the attachment file after sending.
-		///     * throw:      Boolean value indicating whether to throw 
-		///                   exception upon failure.
-		
-	std::string getProperty(const std::string& name) const;
-		/// Returns the value of the property with the given name.
-
-	static void registerChannel();
-		/// Registers the channel with the global LoggingFactory.
-
-	static const std::string PROP_MAILHOST;
-	static const std::string PROP_SENDER;
-	static const std::string PROP_RECIPIENT;
-	static const std::string PROP_LOCAL;
-	static const std::string PROP_ATTACHMENT;
-	static const std::string PROP_TYPE;
-	static const std::string PROP_DELETE;
-	static const std::string PROP_THROW;
-
-protected:
-	~SMTPChannel();
-
-private:
-	bool isTrue(const std::string& value) const;
-
-	std::string _mailHost;
-	std::string _sender;
-	std::string _recipient;
-	bool        _local;
-	std::string _attachment;
-	std::string _type;
-	bool        _delete;
-	bool        _throw;
-};
-
-
-inline bool SMTPChannel::isTrue(const std::string& value) const
-{
-	return ((0 == icompare(value, "true")) ||
-			(0 == icompare(value, "t")) ||
-			(0 == icompare(value, "yes")) ||
-			(0 == icompare(value, "y")));
-}
-
-
-} } // namespace Poco::Net
-
-
-#endif // Net_SMTPChannel_INCLUDED
+//
+// SMTPChannel.h
+//
+// $Id: //poco/svn/Net/include/Poco/Net/SMTPChannel.h#1 $
+//
+// Library: Net
+// Package: Logging
+// Module:  SMTPChannel
+//
+// Definition of the SMTPChannel class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef Net_SMTPChannel_INCLUDED
+#define Net_SMTPChannel_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "Poco/Channel.h"
+#include "Poco/String.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+class Net_API SMTPChannel: public Poco::Channel
+	/// This Channel implements SMTP (email) logging.
+{
+public:
+	SMTPChannel();
+		/// Creates a SMTPChannel.
+		
+	SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient);
+		/// Creates a SMTPChannel with the given target mailhost, sender, and recipient.
+	
+	void open();
+		/// Opens the SMTPChannel.
+		
+	void close();
+		/// Closes the SMTPChannel.
+		
+	void log(const Message& msg);
+		/// Sends the message's text to the recipient.
+		
+	void setProperty(const std::string& name, const std::string& value);
+		/// Sets the property with the given value.
+		///
+		/// The following properties are supported:
+		///     * mailhost:   The SMTP server. Default is "localhost".
+		///     * sender:     The sender address.
+		///     * recipient:  The recipient address.
+		///     * local:      If true, local time is used. Default is true.
+		///     * attachment: Filename of the file to attach.
+		///     * type:       Content type of the file to attach.
+		///     * delete:     Boolean value indicating whether to delete 
+		///                   the attachment file after sending.
+		///     * throw:      Boolean value indicating whether to throw 
+		///                   exception upon failure.
+		
+	std::string getProperty(const std::string& name) const;
+		/// Returns the value of the property with the given name.
+
+	static void registerChannel();
+		/// Registers the channel with the global LoggingFactory.
+
+	static const std::string PROP_MAILHOST;
+	static const std::string PROP_SENDER;
+	static const std::string PROP_RECIPIENT;
+	static const std::string PROP_LOCAL;
+	static const std::string PROP_ATTACHMENT;
+	static const std::string PROP_TYPE;
+	static const std::string PROP_DELETE;
+	static const std::string PROP_THROW;
+
+protected:
+	~SMTPChannel();
+
+private:
+	bool isTrue(const std::string& value) const;
+
+	std::string _mailHost;
+	std::string _sender;
+	std::string _recipient;
+	bool        _local;
+	std::string _attachment;
+	std::string _type;
+	bool        _delete;
+	bool        _throw;
+};
+
+
+inline bool SMTPChannel::isTrue(const std::string& value) const
+{
+	return ((0 == icompare(value, "true")) ||
+			(0 == icompare(value, "t")) ||
+			(0 == icompare(value, "yes")) ||
+			(0 == icompare(value, "y")));
+}
+
+
+} } // namespace Poco::Net
+
+
+#endif // Net_SMTPChannel_INCLUDED
diff --git a/Net/src/AbstractHTTPRequestHandler.cpp b/Net/src/AbstractHTTPRequestHandler.cpp
index 0a069d9e6..037a72af1 100644
--- a/Net/src/AbstractHTTPRequestHandler.cpp
+++ b/Net/src/AbstractHTTPRequestHandler.cpp
@@ -1,131 +1,131 @@
-//
-// AbstractHTTPRequestHandler.cpp
-//
-// $Id: //poco/svn/Net/src/AbstractHTTPRequestHandler.cpp#2 $
-//
-// Library: Net
-// Package: HTTPServer
-// Module:  AbstractHTTPRequestHandler
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/AbstractHTTPRequestHandler.h"
-#include "Poco/Net/HTTPServerRequest.h"
-#include "Poco/Net/HTTPServerResponse.h"
-#include "Poco/Net/HTMLForm.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/Exception.h"
-
-
-using Poco::NumberFormatter;
-
-
-namespace Poco {
-namespace Net {
-
-
-AbstractHTTPRequestHandler::AbstractHTTPRequestHandler():
-	_pRequest(0),
-	_pResponse(0),
-	_pForm(0)
-{
-}
-
-
-AbstractHTTPRequestHandler::~AbstractHTTPRequestHandler()
-{
-	delete _pForm;
-}
-
-
-void AbstractHTTPRequestHandler::handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
-{
-	_pRequest  = &request;
-	_pResponse = &response;
-	if (authenticate())
-	{
-		try
-		{
-			run();
-		}
-		catch (Poco::Exception& exc)
-		{
-			if (!response.sent())
-			{
-				sendErrorResponse(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR, exc.displayText());
-			}
-		}
-		catch (std::exception& exc)
-		{
-			if (!response.sent())
-			{
-				sendErrorResponse(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR, exc.what());
-			}
-		}
-	}
-	else
-	{
-		sendErrorResponse(HTTPResponse::HTTP_UNAUTHORIZED, "");
-	}
-}
-
-
-bool AbstractHTTPRequestHandler::authenticate()
-{
-	return true;
-}
-
-
-HTMLForm& AbstractHTTPRequestHandler::form()
-{
-	if (!_pForm)
-		_pForm = new HTMLForm(request(), request().stream());
-
-	return *_pForm;
-}
-
-
-void AbstractHTTPRequestHandler::sendErrorResponse(HTTPResponse::HTTPStatus status, const std::string& message)
-{
-	response().setStatusAndReason(status);
-	std::string statusAndReason(NumberFormatter::format(static_cast<int>(response().getStatus())));
-	statusAndReason += " - ";
-	statusAndReason += response().getReason();
-	std::string page("<HTML><HEAD><TITLE>");
-	page += statusAndReason;
-	page += "</TITLE></HEAD><BODY><H1>";
-	page += statusAndReason;
-	page += "</H1>";
-	page += "<P>";
-	page += message;
-	page += "</P></BODY></HTML>";
-	response().sendBuffer(page.data(), page.size());
-}
-
-
-} } // namespace Poco::Net
+//
+// AbstractHTTPRequestHandler.cpp
+//
+// $Id: //poco/svn/Net/src/AbstractHTTPRequestHandler.cpp#2 $
+//
+// Library: Net
+// Package: HTTPServer
+// Module:  AbstractHTTPRequestHandler
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/AbstractHTTPRequestHandler.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTMLForm.h"
+#include "Poco/NumberFormatter.h"
+#include "Poco/Exception.h"
+
+
+using Poco::NumberFormatter;
+
+
+namespace Poco {
+namespace Net {
+
+
+AbstractHTTPRequestHandler::AbstractHTTPRequestHandler():
+	_pRequest(0),
+	_pResponse(0),
+	_pForm(0)
+{
+}
+
+
+AbstractHTTPRequestHandler::~AbstractHTTPRequestHandler()
+{
+	delete _pForm;
+}
+
+
+void AbstractHTTPRequestHandler::handleRequest(HTTPServerRequest& request, HTTPServerResponse& response)
+{
+	_pRequest  = &request;
+	_pResponse = &response;
+	if (authenticate())
+	{
+		try
+		{
+			run();
+		}
+		catch (Poco::Exception& exc)
+		{
+			if (!response.sent())
+			{
+				sendErrorResponse(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR, exc.displayText());
+			}
+		}
+		catch (std::exception& exc)
+		{
+			if (!response.sent())
+			{
+				sendErrorResponse(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR, exc.what());
+			}
+		}
+	}
+	else
+	{
+		sendErrorResponse(HTTPResponse::HTTP_UNAUTHORIZED, "");
+	}
+}
+
+
+bool AbstractHTTPRequestHandler::authenticate()
+{
+	return true;
+}
+
+
+HTMLForm& AbstractHTTPRequestHandler::form()
+{
+	if (!_pForm)
+		_pForm = new HTMLForm(request(), request().stream());
+
+	return *_pForm;
+}
+
+
+void AbstractHTTPRequestHandler::sendErrorResponse(HTTPResponse::HTTPStatus status, const std::string& message)
+{
+	response().setStatusAndReason(status);
+	std::string statusAndReason(NumberFormatter::format(static_cast<int>(response().getStatus())));
+	statusAndReason += " - ";
+	statusAndReason += response().getReason();
+	std::string page("<HTML><HEAD><TITLE>");
+	page += statusAndReason;
+	page += "</TITLE></HEAD><BODY><H1>";
+	page += statusAndReason;
+	page += "</H1>";
+	page += "<P>";
+	page += message;
+	page += "</P></BODY></HTML>";
+	response().sendBuffer(page.data(), page.size());
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/src/AsyncSocketChannel.cpp b/Net/src/AsyncSocketChannel.cpp
index b17fa39f8..6b1de5a05 100644
--- a/Net/src/AsyncSocketChannel.cpp
+++ b/Net/src/AsyncSocketChannel.cpp
@@ -1,67 +1,67 @@
-//
-// AsyncSocketChannel.cpp
-//
-// $Id: //poco/svn/Net/src/AsyncSocketChannel.cpp#2 $
-//
-// Library: Net
-// Package: AsyncIO
-// Module:  AsyncSocketChannel
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/AsyncSocketChannel.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-AsyncSocketChannel::AsyncSocketChannel(const StreamSocket& socket):
-	_socket(socket)
-{
-}
-
-	
-AsyncSocketChannel::~AsyncSocketChannel()
-{
-}
-
-
-int AsyncSocketChannel::write(const void* buffer, int length)
-{
-	return _socket.sendBytes(buffer, length);
-}
-
-
-int AsyncSocketChannel::read(void* buffer, int length)
-{
-	return _socket.receiveBytes(buffer, length);
-}
-
-
-} } // namespace Poco::Net
+//
+// AsyncSocketChannel.cpp
+//
+// $Id: //poco/svn/Net/src/AsyncSocketChannel.cpp#2 $
+//
+// Library: Net
+// Package: AsyncIO
+// Module:  AsyncSocketChannel
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/AsyncSocketChannel.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+AsyncSocketChannel::AsyncSocketChannel(const StreamSocket& socket):
+	_socket(socket)
+{
+}
+
+	
+AsyncSocketChannel::~AsyncSocketChannel()
+{
+}
+
+
+int AsyncSocketChannel::write(const void* buffer, int length)
+{
+	return _socket.sendBytes(buffer, length);
+}
+
+
+int AsyncSocketChannel::read(void* buffer, int length)
+{
+	return _socket.receiveBytes(buffer, length);
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/src/HTTPServerRequestImpl.cpp b/Net/src/HTTPServerRequestImpl.cpp
index 346176111..4a3c87bea 100644
--- a/Net/src/HTTPServerRequestImpl.cpp
+++ b/Net/src/HTTPServerRequestImpl.cpp
@@ -1,94 +1,94 @@
-//
-// HTTPServerRequestImpl.cpp
-//
-// $Id: //poco/svn/Net/src/HTTPServerRequestImpl.cpp#2 $
-//
-// Library: Net
-// Package: HTTPServer
-// Module:  HTTPServerRequestImpl
-//
-// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/HTTPServerRequestImpl.h"
-#include "Poco/Net/HTTPServerSession.h"
-#include "Poco/Net/HTTPHeaderStream.h"
-#include "Poco/Net/HTTPStream.h"
-#include "Poco/Net/HTTPFixedLengthStream.h"
-#include "Poco/Net/HTTPChunkedStream.h"
-#include "Poco/Net/HTTPServerParams.h"
-#include "Poco/String.h"
-
-
-using Poco::icompare;
-
-
-namespace Poco {
-namespace Net {
-
-
-HTTPServerRequestImpl::HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams):
-	_response(response),
-	_pStream(0),
-	_pParams(pParams)
-{
-	poco_check_ptr (_pParams);
-	
-	_pParams->duplicate();
-
-	HTTPHeaderInputStream hs(session);
-	read(hs);
-	
-	// Now that we know socket is still connected, obtain addresses
-	_clientAddress = session.clientAddress();
-	_serverAddress = session.serverAddress();
-	
-	if (getChunkedTransferEncoding())
-		_pStream = new HTTPChunkedInputStream(session);
-	else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
-		_pStream = new HTTPFixedLengthInputStream(session, getContentLength());
-	else if (getMethod() == HTTPRequest::HTTP_GET || getMethod() == HTTPRequest::HTTP_HEAD)
-		_pStream = new HTTPFixedLengthInputStream(session, 0);
-	else
-		_pStream = new HTTPInputStream(session);
-}
-
-
-HTTPServerRequestImpl::~HTTPServerRequestImpl()
-{
-	_pParams->release();
-	delete _pStream;
-}
-
-
-bool HTTPServerRequestImpl::expectContinue() const
-{
-	return has("Expect") && icompare(get("Expect"), "100-continue") == 0;
-}
-
-
-} } // namespace Poco::Net
+//
+// HTTPServerRequestImpl.cpp
+//
+// $Id: //poco/svn/Net/src/HTTPServerRequestImpl.cpp#2 $
+//
+// Library: Net
+// Package: HTTPServer
+// Module:  HTTPServerRequestImpl
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/HTTPServerRequestImpl.h"
+#include "Poco/Net/HTTPServerSession.h"
+#include "Poco/Net/HTTPHeaderStream.h"
+#include "Poco/Net/HTTPStream.h"
+#include "Poco/Net/HTTPFixedLengthStream.h"
+#include "Poco/Net/HTTPChunkedStream.h"
+#include "Poco/Net/HTTPServerParams.h"
+#include "Poco/String.h"
+
+
+using Poco::icompare;
+
+
+namespace Poco {
+namespace Net {
+
+
+HTTPServerRequestImpl::HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams):
+	_response(response),
+	_pStream(0),
+	_pParams(pParams)
+{
+	poco_check_ptr (_pParams);
+	
+	_pParams->duplicate();
+
+	HTTPHeaderInputStream hs(session);
+	read(hs);
+	
+	// Now that we know socket is still connected, obtain addresses
+	_clientAddress = session.clientAddress();
+	_serverAddress = session.serverAddress();
+	
+	if (getChunkedTransferEncoding())
+		_pStream = new HTTPChunkedInputStream(session);
+	else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
+		_pStream = new HTTPFixedLengthInputStream(session, getContentLength());
+	else if (getMethod() == HTTPRequest::HTTP_GET || getMethod() == HTTPRequest::HTTP_HEAD)
+		_pStream = new HTTPFixedLengthInputStream(session, 0);
+	else
+		_pStream = new HTTPInputStream(session);
+}
+
+
+HTTPServerRequestImpl::~HTTPServerRequestImpl()
+{
+	_pParams->release();
+	delete _pStream;
+}
+
+
+bool HTTPServerRequestImpl::expectContinue() const
+{
+	return has("Expect") && icompare(get("Expect"), "100-continue") == 0;
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/src/HTTPServerResponseImpl.cpp b/Net/src/HTTPServerResponseImpl.cpp
index 734168140..50a6219d9 100644
--- a/Net/src/HTTPServerResponseImpl.cpp
+++ b/Net/src/HTTPServerResponseImpl.cpp
@@ -1,176 +1,176 @@
-//
-// HTTPServerResponseImpl.cpp
-//
-// $Id: //poco/svn/Net/src/HTTPServerResponseImpl.cpp#3 $
-//
-// Library: Net
-// Package: HTTPServer
-// Module:  HTTPServerResponseImpl
-//
-// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/HTTPServerResponseImpl.h"
-#include "Poco/Net/HTTPServerSession.h"
-#include "Poco/Net/HTTPHeaderStream.h"
-#include "Poco/Net/HTTPStream.h"
-#include "Poco/Net/HTTPFixedLengthStream.h"
-#include "Poco/Net/HTTPChunkedStream.h"
-#include "Poco/File.h"
-#include "Poco/Timestamp.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/StreamCopier.h"
-#include "Poco/CountingStream.h"
-#include "Poco/Exception.h"
-#include "Poco/FileStream.h"
-#include "Poco/DateTimeFormatter.h"
-#include "Poco/DateTimeFormat.h"
-
-
-using Poco::File;
-using Poco::Timestamp;
-using Poco::NumberFormatter;
-using Poco::StreamCopier;
-using Poco::OpenFileException;
-using Poco::DateTimeFormatter;
-using Poco::DateTimeFormat;
-
-
-namespace Poco {
-namespace Net {
-
-
-HTTPServerResponseImpl::HTTPServerResponseImpl(HTTPServerSession& session):
-	_session(session),
-	_pStream(0)
-{
-	Timestamp now;
-	setDate(now);
-}
-
-
-HTTPServerResponseImpl::~HTTPServerResponseImpl()
-{
-	delete _pStream;
-}
-
-
-void HTTPServerResponseImpl::sendContinue()
-{
-	HTTPHeaderOutputStream hs(_session);
-	hs << getVersion() << " 100 Continue\r\n\r\n";
-}
-
-
-std::ostream& HTTPServerResponseImpl::send()
-{
-	poco_assert (!_pStream);
-
-	if (getChunkedTransferEncoding())
-	{
-		HTTPHeaderOutputStream hs(_session);
-		write(hs);
-		_pStream = new HTTPChunkedOutputStream(_session);
-	}
-	else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
-	{
-		Poco::CountingOutputStream cs;
-		write(cs);
-		_pStream = new HTTPFixedLengthOutputStream(_session, getContentLength() + cs.chars());
-		write(*_pStream);
-	}
-	else
-	{
-		_pStream = new HTTPOutputStream(_session);
-		setKeepAlive(false);
-		write(*_pStream);
-	}
-	return *_pStream;
-}
-
-
-void HTTPServerResponseImpl::sendFile(const std::string& path, const std::string& mediaType)
-{
-	poco_assert (!_pStream);
-
-	File f(path);
-	Timestamp dateTime    = f.getLastModified();
-	File::FileSize length = f.getSize();
-	set("Last-Modified", DateTimeFormatter::format(dateTime, DateTimeFormat::HTTP_FORMAT));
-	setContentLength(static_cast<int>(length));
-	setContentType(mediaType);
-	setChunkedTransferEncoding(false);
-
-	Poco::FileInputStream istr(path);
-	if (istr.good())
-	{
-		_pStream = new HTTPOutputStream(_session);
-		write(*_pStream);
-		StreamCopier::copyStream(istr, *_pStream);
-	}
-	else throw OpenFileException(path);
-}
-
-
-void HTTPServerResponseImpl::sendBuffer(const void* pBuffer, std::size_t length)
-{
-	poco_assert (!_pStream);
-
-	setContentLength(static_cast<int>(length));
-	setChunkedTransferEncoding(false);
-	
-	_pStream = new HTTPOutputStream(_session);
-	write(*_pStream);
-	_pStream->write(static_cast<const char*>(pBuffer), static_cast<std::streamsize>(length));
-}
-
-
-void HTTPServerResponseImpl::redirect(const std::string& uri)
-{
-	poco_assert (!_pStream);
-
-	setStatusAndReason(HTTPResponse::HTTP_FOUND);
-	set("Location", uri);
-
-	_pStream = new HTTPOutputStream(_session);
-	write(*_pStream);
-}
-
-
-void HTTPServerResponseImpl::requireAuthentication(const std::string& realm)
-{
-	poco_assert (!_pStream);
-	
-	setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
-	std::string auth("Basic realm=\"");
-	auth.append(realm);
-	auth.append("\"");
-	set("WWW-Authenticate", auth);
-}
-
-
-} } // namespace Poco::Net
+//
+// HTTPServerResponseImpl.cpp
+//
+// $Id: //poco/svn/Net/src/HTTPServerResponseImpl.cpp#3 $
+//
+// Library: Net
+// Package: HTTPServer
+// Module:  HTTPServerResponseImpl
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/HTTPServerResponseImpl.h"
+#include "Poco/Net/HTTPServerSession.h"
+#include "Poco/Net/HTTPHeaderStream.h"
+#include "Poco/Net/HTTPStream.h"
+#include "Poco/Net/HTTPFixedLengthStream.h"
+#include "Poco/Net/HTTPChunkedStream.h"
+#include "Poco/File.h"
+#include "Poco/Timestamp.h"
+#include "Poco/NumberFormatter.h"
+#include "Poco/StreamCopier.h"
+#include "Poco/CountingStream.h"
+#include "Poco/Exception.h"
+#include "Poco/FileStream.h"
+#include "Poco/DateTimeFormatter.h"
+#include "Poco/DateTimeFormat.h"
+
+
+using Poco::File;
+using Poco::Timestamp;
+using Poco::NumberFormatter;
+using Poco::StreamCopier;
+using Poco::OpenFileException;
+using Poco::DateTimeFormatter;
+using Poco::DateTimeFormat;
+
+
+namespace Poco {
+namespace Net {
+
+
+HTTPServerResponseImpl::HTTPServerResponseImpl(HTTPServerSession& session):
+	_session(session),
+	_pStream(0)
+{
+	Timestamp now;
+	setDate(now);
+}
+
+
+HTTPServerResponseImpl::~HTTPServerResponseImpl()
+{
+	delete _pStream;
+}
+
+
+void HTTPServerResponseImpl::sendContinue()
+{
+	HTTPHeaderOutputStream hs(_session);
+	hs << getVersion() << " 100 Continue\r\n\r\n";
+}
+
+
+std::ostream& HTTPServerResponseImpl::send()
+{
+	poco_assert (!_pStream);
+
+	if (getChunkedTransferEncoding())
+	{
+		HTTPHeaderOutputStream hs(_session);
+		write(hs);
+		_pStream = new HTTPChunkedOutputStream(_session);
+	}
+	else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
+	{
+		Poco::CountingOutputStream cs;
+		write(cs);
+		_pStream = new HTTPFixedLengthOutputStream(_session, getContentLength() + cs.chars());
+		write(*_pStream);
+	}
+	else
+	{
+		_pStream = new HTTPOutputStream(_session);
+		setKeepAlive(false);
+		write(*_pStream);
+	}
+	return *_pStream;
+}
+
+
+void HTTPServerResponseImpl::sendFile(const std::string& path, const std::string& mediaType)
+{
+	poco_assert (!_pStream);
+
+	File f(path);
+	Timestamp dateTime    = f.getLastModified();
+	File::FileSize length = f.getSize();
+	set("Last-Modified", DateTimeFormatter::format(dateTime, DateTimeFormat::HTTP_FORMAT));
+	setContentLength(static_cast<int>(length));
+	setContentType(mediaType);
+	setChunkedTransferEncoding(false);
+
+	Poco::FileInputStream istr(path);
+	if (istr.good())
+	{
+		_pStream = new HTTPOutputStream(_session);
+		write(*_pStream);
+		StreamCopier::copyStream(istr, *_pStream);
+	}
+	else throw OpenFileException(path);
+}
+
+
+void HTTPServerResponseImpl::sendBuffer(const void* pBuffer, std::size_t length)
+{
+	poco_assert (!_pStream);
+
+	setContentLength(static_cast<int>(length));
+	setChunkedTransferEncoding(false);
+	
+	_pStream = new HTTPOutputStream(_session);
+	write(*_pStream);
+	_pStream->write(static_cast<const char*>(pBuffer), static_cast<std::streamsize>(length));
+}
+
+
+void HTTPServerResponseImpl::redirect(const std::string& uri)
+{
+	poco_assert (!_pStream);
+
+	setStatusAndReason(HTTPResponse::HTTP_FOUND);
+	set("Location", uri);
+
+	_pStream = new HTTPOutputStream(_session);
+	write(*_pStream);
+}
+
+
+void HTTPServerResponseImpl::requireAuthentication(const std::string& realm)
+{
+	poco_assert (!_pStream);
+	
+	setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
+	std::string auth("Basic realm=\"");
+	auth.append(realm);
+	auth.append("\"");
+	set("WWW-Authenticate", auth);
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/src/RemoteSyslogChannel.cpp b/Net/src/RemoteSyslogChannel.cpp
index 4b67b88bb..6ceff98f7 100644
--- a/Net/src/RemoteSyslogChannel.cpp
+++ b/Net/src/RemoteSyslogChannel.cpp
@@ -1,355 +1,355 @@
-//
-// RemoteSyslogChannel.cpp
-//
-// $Id: //poco/svn/Net/src/RemoteSyslogChannel.cpp#2 $
-//
-// Library: Net
-// Package: Logging
-// Module:  RemoteSyslogChannel
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/RemoteSyslogChannel.h"
-#include "Poco/Message.h"
-#include "Poco/DateTimeFormatter.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/Net/SocketAddress.h"
-#include "Poco/Net/DNS.h"
-#include "Poco/LoggingFactory.h"
-#include "Poco/Instantiator.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-const std::string RemoteSyslogChannel::BSD_TIMEFORMAT("%b %f %H:%M:%S");
-const std::string RemoteSyslogChannel::SYSLOG_TIMEFORMAT("%Y-%m-%dT%H:%M:%S.%i%z");
-const std::string RemoteSyslogChannel::PROP_NAME("name");
-const std::string RemoteSyslogChannel::PROP_FACILITY("facility");
-const std::string RemoteSyslogChannel::PROP_FORMAT("format");
-const std::string RemoteSyslogChannel::PROP_LOGHOST("loghost");
-const std::string RemoteSyslogChannel::PROP_HOST("host");
-
-
-RemoteSyslogChannel::RemoteSyslogChannel():
-	_logHost("localhost"),
-	_name("-"),
-	_facility(SYSLOG_USER),
-	_bsdFormat(false),
-	_open(false)
-{
-}
-
-		
-RemoteSyslogChannel::RemoteSyslogChannel(const std::string& address, const std::string& name, int facility, bool bsdFormat):
-	_logHost(address),
-	_name(name),
-	_facility(facility),
-	_bsdFormat(bsdFormat),
-	_open(false)
-{
-	if (_name.empty()) _name = "-";
-}
-
-
-RemoteSyslogChannel::~RemoteSyslogChannel()
-{
-	close();
-}
-
-
-void RemoteSyslogChannel::open()
-{
-	if (_open) return;
-	
-	SocketAddress sa;
-	if (_logHost.find(':') != std::string::npos)
-		sa = SocketAddress(_logHost);
-	else
-		sa = SocketAddress(_logHost, SYSLOG_PORT);
-
-	_socket.connect(sa);
-	if (_host.empty())
-	{
-		try
-		{
-			_host = DNS::thisHost().name();
-		}
-		catch (Poco::Exception&)
-		{
-			_host = _socket.address().host().toString();
-		}
-	}
-}
-
-	
-void RemoteSyslogChannel::close()
-{
-	if (_open)
-	{
-		_socket.close();
-		_open = false;
-	}
-}
-
-	
-void RemoteSyslogChannel::log(const Message& msg)
-{
-	if (!_open) open();
-
-	std::string m;
-	m.reserve(1024);
-	m += '<';
-	m += Poco::NumberFormatter::format(getPrio(msg) + _facility);
-	m += '>';
-	if (_bsdFormat)
-	{
-		m += Poco::DateTimeFormatter::format(msg.getTime(), BSD_TIMEFORMAT);
-		m += ' ';
-		m += _host;
-	}
-	else
-	{
-		m += "1 "; // version
-		m += Poco::DateTimeFormatter::format(msg.getTime(), SYSLOG_TIMEFORMAT);
-		m += ' ';
-		m += _host;
-		m += ' ';
-		m += _name;
-		m += ' ';
-		m += Poco::NumberFormatter::format(msg.getPid());
-		m += ' ';
-		m += msg.getSource();
-	}
-	m += ' ';
-	m += msg.getText();
-
-	_socket.sendBytes(m.data(), (int) m.size());
-}
-
-	
-void RemoteSyslogChannel::setProperty(const std::string& name, const std::string& value)
-{
-	if (name == PROP_NAME)
-	{
-		_name = value;
-		if (_name.empty()) _name = "-";
-	}
-	else if (name == PROP_FACILITY)
-	{
-		std::string facility;
-		if (Poco::icompare(value, 4, "LOG_") == 0)
-			facility = Poco::toUpper(value.substr(4));
-		else if (Poco::icompare(value, 4, "SYSLOG_") == 0)
-			facility = Poco::toUpper(value.substr(7));
-		else
-			facility = Poco::toUpper(value);
-		
-		if (facility == "KERN")
-			_facility = SYSLOG_KERN;
-		else if (facility == "USER")
-			_facility = SYSLOG_USER;
-		else if (facility == "MAIL")
-			_facility = SYSLOG_MAIL;
-		else if (facility == "DAEMON")
-			_facility = SYSLOG_DAEMON;
-		else if (facility == "AUTH")
-			_facility = SYSLOG_AUTH;
-		else if (facility == "AUTHPRIV")
-			_facility = SYSLOG_AUTHPRIV;
-		else if (facility == "SYSLOG")
-			_facility = SYSLOG_SYSLOG;
-		else if (facility == "LPR")
-			_facility = SYSLOG_LPR;
-		else if (facility == "NEWS")
-			_facility = SYSLOG_NEWS;
-		else if (facility == "UUCP")
-			_facility = SYSLOG_UUCP;
-		else if (facility == "CRON")
-			_facility = SYSLOG_CRON;
-		else if (facility == "FTP")
-			_facility = SYSLOG_FTP;
-		else if (facility == "NTP")
-			_facility = SYSLOG_NTP;
-		else if (facility == "LOGAUDIT")
-			_facility = SYSLOG_LOGAUDIT;
-		else if (facility == "LOGALERT")
-			_facility = SYSLOG_LOGALERT;
-		else if (facility == "CLOCK")
-			_facility = SYSLOG_CLOCK;
-		else if (facility == "LOCAL0")
-			_facility = SYSLOG_LOCAL0;
-		else if (facility == "LOCAL1")
-			_facility = SYSLOG_LOCAL1;
-		else if (facility == "LOCAL2")
-			_facility = SYSLOG_LOCAL2;
-		else if (facility == "LOCAL3")
-			_facility = SYSLOG_LOCAL3;
-		else if (facility == "LOCAL4")
-			_facility = SYSLOG_LOCAL4;
-		else if (facility == "LOCAL5")
-			_facility = SYSLOG_LOCAL5;
-		else if (facility == "LOCAL6")
-			_facility = SYSLOG_LOCAL6;
-		else if (facility == "LOCAL7")
-			_facility = SYSLOG_LOCAL7;
-	}
-	else if (name == PROP_LOGHOST)
-	{
-		_logHost = value;
-	}
-	else if (name == PROP_HOST)
-	{
-		_host = value;
-	}
-	else if (name == PROP_FORMAT)
-	{
-		_bsdFormat = (value == "bsd");
-	}
-	else
-	{
-		Channel::setProperty(name, value);
-	}
-}
-
-	
-std::string RemoteSyslogChannel::getProperty(const std::string& name) const
-{
-	if (name == PROP_NAME)
-	{
-		if (_name != "-")
-			return _name;
-		else
-			return "";
-	}
-	else if (name == PROP_FACILITY)
-	{
-		if (_facility == SYSLOG_KERN)
-			return "KERN";
-		else if (_facility == SYSLOG_USER)
-			return "USER";
-		else if (_facility == SYSLOG_MAIL)
-			return "MAIL";
-		else if (_facility == SYSLOG_DAEMON)
-			return "DAEMON";
-		else if (_facility == SYSLOG_AUTH)
-			return "AUTH";
-		else if (_facility == SYSLOG_AUTHPRIV)
-			return "AUTHPRIV";
-		else if (_facility == SYSLOG_SYSLOG)
-			return "SYSLOG";
-		else if (_facility == SYSLOG_LPR)
-			return "LPR";
-		else if (_facility == SYSLOG_NEWS)
-			return "NEWS";
-		else if (_facility == SYSLOG_UUCP)
-			return "UUCP";
-		else if (_facility == SYSLOG_CRON)
-			return "CRON";
-		else if (_facility == SYSLOG_FTP)
-			return "FTP";
-		else if (_facility == SYSLOG_NTP)
-			return "NTP";
-		else if (_facility == SYSLOG_LOGAUDIT)
-			return "LOGAUDIT";
-		else if (_facility == SYSLOG_LOGALERT)
-			return "LOGALERT";
-		else if (_facility == SYSLOG_CLOCK)
-			return "CLOCK";
-		else if (_facility == SYSLOG_LOCAL0)
-			return "LOCAL0";
-		else if (_facility == SYSLOG_LOCAL1)
-			return "LOCAL1";
-		else if (_facility == SYSLOG_LOCAL2)
-			return "LOCAL2";
-		else if (_facility == SYSLOG_LOCAL3)
-			return "LOCAL3";
-		else if (_facility == SYSLOG_LOCAL4)
-			return "LOCAL4";
-		else if (_facility == SYSLOG_LOCAL5)
-			return "LOCAL5";
-		else if (_facility == SYSLOG_LOCAL6)
-			return "LOCAL6";
-		else if (_facility == SYSLOG_LOCAL7)
-			return "LOCAL7";
-		else
-			return "";
-	}
-	else if (name == PROP_LOGHOST)
-	{
-		return _logHost;
-	}
-	else if (name == PROP_HOST)
-	{
-		return _host;
-	}
-	else if (name == PROP_FORMAT)
-	{
-		return _bsdFormat ? "bsd" : "new";
-	}
-	else
-	{
-		return Channel::getProperty(name);
-	}
-}
-
-
-int RemoteSyslogChannel::getPrio(const Message& msg)
-{
-	switch (msg.getPriority())
-	{
-	case Message::PRIO_TRACE:
-	case Message::PRIO_DEBUG:
-		return SYSLOG_DEBUG;
-	case Message::PRIO_INFORMATION:
-		return SYSLOG_INFORMATIONAL;
-	case Message::PRIO_NOTICE:
-		return SYSLOG_NOTICE;
-	case Message::PRIO_WARNING:
-		return SYSLOG_WARNING;
-	case Message::PRIO_ERROR:
-		return SYSLOG_ERROR;
-	case Message::PRIO_CRITICAL:
-		return SYSLOG_CRITICAL;
-	case Message::PRIO_FATAL:
-		return SYSLOG_ALERT;
-	default:
-		return 0;
-	}
-}
-
-
-void RemoteSyslogChannel::registerChannel()
-{
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("RemoteSyslogChannel", new Poco::Instantiator<RemoteSyslogChannel, Poco::Channel>);
-}
-
-
-} } // namespace Poco::Net
+//
+// RemoteSyslogChannel.cpp
+//
+// $Id: //poco/svn/Net/src/RemoteSyslogChannel.cpp#2 $
+//
+// Library: Net
+// Package: Logging
+// Module:  RemoteSyslogChannel
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/RemoteSyslogChannel.h"
+#include "Poco/Message.h"
+#include "Poco/DateTimeFormatter.h"
+#include "Poco/NumberFormatter.h"
+#include "Poco/Net/SocketAddress.h"
+#include "Poco/Net/DNS.h"
+#include "Poco/LoggingFactory.h"
+#include "Poco/Instantiator.h"
+#include "Poco/String.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+const std::string RemoteSyslogChannel::BSD_TIMEFORMAT("%b %f %H:%M:%S");
+const std::string RemoteSyslogChannel::SYSLOG_TIMEFORMAT("%Y-%m-%dT%H:%M:%S.%i%z");
+const std::string RemoteSyslogChannel::PROP_NAME("name");
+const std::string RemoteSyslogChannel::PROP_FACILITY("facility");
+const std::string RemoteSyslogChannel::PROP_FORMAT("format");
+const std::string RemoteSyslogChannel::PROP_LOGHOST("loghost");
+const std::string RemoteSyslogChannel::PROP_HOST("host");
+
+
+RemoteSyslogChannel::RemoteSyslogChannel():
+	_logHost("localhost"),
+	_name("-"),
+	_facility(SYSLOG_USER),
+	_bsdFormat(false),
+	_open(false)
+{
+}
+
+		
+RemoteSyslogChannel::RemoteSyslogChannel(const std::string& address, const std::string& name, int facility, bool bsdFormat):
+	_logHost(address),
+	_name(name),
+	_facility(facility),
+	_bsdFormat(bsdFormat),
+	_open(false)
+{
+	if (_name.empty()) _name = "-";
+}
+
+
+RemoteSyslogChannel::~RemoteSyslogChannel()
+{
+	close();
+}
+
+
+void RemoteSyslogChannel::open()
+{
+	if (_open) return;
+	
+	SocketAddress sa;
+	if (_logHost.find(':') != std::string::npos)
+		sa = SocketAddress(_logHost);
+	else
+		sa = SocketAddress(_logHost, SYSLOG_PORT);
+
+	_socket.connect(sa);
+	if (_host.empty())
+	{
+		try
+		{
+			_host = DNS::thisHost().name();
+		}
+		catch (Poco::Exception&)
+		{
+			_host = _socket.address().host().toString();
+		}
+	}
+}
+
+	
+void RemoteSyslogChannel::close()
+{
+	if (_open)
+	{
+		_socket.close();
+		_open = false;
+	}
+}
+
+	
+void RemoteSyslogChannel::log(const Message& msg)
+{
+	if (!_open) open();
+
+	std::string m;
+	m.reserve(1024);
+	m += '<';
+	m += Poco::NumberFormatter::format(getPrio(msg) + _facility);
+	m += '>';
+	if (_bsdFormat)
+	{
+		m += Poco::DateTimeFormatter::format(msg.getTime(), BSD_TIMEFORMAT);
+		m += ' ';
+		m += _host;
+	}
+	else
+	{
+		m += "1 "; // version
+		m += Poco::DateTimeFormatter::format(msg.getTime(), SYSLOG_TIMEFORMAT);
+		m += ' ';
+		m += _host;
+		m += ' ';
+		m += _name;
+		m += ' ';
+		m += Poco::NumberFormatter::format(msg.getPid());
+		m += ' ';
+		m += msg.getSource();
+	}
+	m += ' ';
+	m += msg.getText();
+
+	_socket.sendBytes(m.data(), (int) m.size());
+}
+
+	
+void RemoteSyslogChannel::setProperty(const std::string& name, const std::string& value)
+{
+	if (name == PROP_NAME)
+	{
+		_name = value;
+		if (_name.empty()) _name = "-";
+	}
+	else if (name == PROP_FACILITY)
+	{
+		std::string facility;
+		if (Poco::icompare(value, 4, "LOG_") == 0)
+			facility = Poco::toUpper(value.substr(4));
+		else if (Poco::icompare(value, 4, "SYSLOG_") == 0)
+			facility = Poco::toUpper(value.substr(7));
+		else
+			facility = Poco::toUpper(value);
+		
+		if (facility == "KERN")
+			_facility = SYSLOG_KERN;
+		else if (facility == "USER")
+			_facility = SYSLOG_USER;
+		else if (facility == "MAIL")
+			_facility = SYSLOG_MAIL;
+		else if (facility == "DAEMON")
+			_facility = SYSLOG_DAEMON;
+		else if (facility == "AUTH")
+			_facility = SYSLOG_AUTH;
+		else if (facility == "AUTHPRIV")
+			_facility = SYSLOG_AUTHPRIV;
+		else if (facility == "SYSLOG")
+			_facility = SYSLOG_SYSLOG;
+		else if (facility == "LPR")
+			_facility = SYSLOG_LPR;
+		else if (facility == "NEWS")
+			_facility = SYSLOG_NEWS;
+		else if (facility == "UUCP")
+			_facility = SYSLOG_UUCP;
+		else if (facility == "CRON")
+			_facility = SYSLOG_CRON;
+		else if (facility == "FTP")
+			_facility = SYSLOG_FTP;
+		else if (facility == "NTP")
+			_facility = SYSLOG_NTP;
+		else if (facility == "LOGAUDIT")
+			_facility = SYSLOG_LOGAUDIT;
+		else if (facility == "LOGALERT")
+			_facility = SYSLOG_LOGALERT;
+		else if (facility == "CLOCK")
+			_facility = SYSLOG_CLOCK;
+		else if (facility == "LOCAL0")
+			_facility = SYSLOG_LOCAL0;
+		else if (facility == "LOCAL1")
+			_facility = SYSLOG_LOCAL1;
+		else if (facility == "LOCAL2")
+			_facility = SYSLOG_LOCAL2;
+		else if (facility == "LOCAL3")
+			_facility = SYSLOG_LOCAL3;
+		else if (facility == "LOCAL4")
+			_facility = SYSLOG_LOCAL4;
+		else if (facility == "LOCAL5")
+			_facility = SYSLOG_LOCAL5;
+		else if (facility == "LOCAL6")
+			_facility = SYSLOG_LOCAL6;
+		else if (facility == "LOCAL7")
+			_facility = SYSLOG_LOCAL7;
+	}
+	else if (name == PROP_LOGHOST)
+	{
+		_logHost = value;
+	}
+	else if (name == PROP_HOST)
+	{
+		_host = value;
+	}
+	else if (name == PROP_FORMAT)
+	{
+		_bsdFormat = (value == "bsd");
+	}
+	else
+	{
+		Channel::setProperty(name, value);
+	}
+}
+
+	
+std::string RemoteSyslogChannel::getProperty(const std::string& name) const
+{
+	if (name == PROP_NAME)
+	{
+		if (_name != "-")
+			return _name;
+		else
+			return "";
+	}
+	else if (name == PROP_FACILITY)
+	{
+		if (_facility == SYSLOG_KERN)
+			return "KERN";
+		else if (_facility == SYSLOG_USER)
+			return "USER";
+		else if (_facility == SYSLOG_MAIL)
+			return "MAIL";
+		else if (_facility == SYSLOG_DAEMON)
+			return "DAEMON";
+		else if (_facility == SYSLOG_AUTH)
+			return "AUTH";
+		else if (_facility == SYSLOG_AUTHPRIV)
+			return "AUTHPRIV";
+		else if (_facility == SYSLOG_SYSLOG)
+			return "SYSLOG";
+		else if (_facility == SYSLOG_LPR)
+			return "LPR";
+		else if (_facility == SYSLOG_NEWS)
+			return "NEWS";
+		else if (_facility == SYSLOG_UUCP)
+			return "UUCP";
+		else if (_facility == SYSLOG_CRON)
+			return "CRON";
+		else if (_facility == SYSLOG_FTP)
+			return "FTP";
+		else if (_facility == SYSLOG_NTP)
+			return "NTP";
+		else if (_facility == SYSLOG_LOGAUDIT)
+			return "LOGAUDIT";
+		else if (_facility == SYSLOG_LOGALERT)
+			return "LOGALERT";
+		else if (_facility == SYSLOG_CLOCK)
+			return "CLOCK";
+		else if (_facility == SYSLOG_LOCAL0)
+			return "LOCAL0";
+		else if (_facility == SYSLOG_LOCAL1)
+			return "LOCAL1";
+		else if (_facility == SYSLOG_LOCAL2)
+			return "LOCAL2";
+		else if (_facility == SYSLOG_LOCAL3)
+			return "LOCAL3";
+		else if (_facility == SYSLOG_LOCAL4)
+			return "LOCAL4";
+		else if (_facility == SYSLOG_LOCAL5)
+			return "LOCAL5";
+		else if (_facility == SYSLOG_LOCAL6)
+			return "LOCAL6";
+		else if (_facility == SYSLOG_LOCAL7)
+			return "LOCAL7";
+		else
+			return "";
+	}
+	else if (name == PROP_LOGHOST)
+	{
+		return _logHost;
+	}
+	else if (name == PROP_HOST)
+	{
+		return _host;
+	}
+	else if (name == PROP_FORMAT)
+	{
+		return _bsdFormat ? "bsd" : "new";
+	}
+	else
+	{
+		return Channel::getProperty(name);
+	}
+}
+
+
+int RemoteSyslogChannel::getPrio(const Message& msg)
+{
+	switch (msg.getPriority())
+	{
+	case Message::PRIO_TRACE:
+	case Message::PRIO_DEBUG:
+		return SYSLOG_DEBUG;
+	case Message::PRIO_INFORMATION:
+		return SYSLOG_INFORMATIONAL;
+	case Message::PRIO_NOTICE:
+		return SYSLOG_NOTICE;
+	case Message::PRIO_WARNING:
+		return SYSLOG_WARNING;
+	case Message::PRIO_ERROR:
+		return SYSLOG_ERROR;
+	case Message::PRIO_CRITICAL:
+		return SYSLOG_CRITICAL;
+	case Message::PRIO_FATAL:
+		return SYSLOG_ALERT;
+	default:
+		return 0;
+	}
+}
+
+
+void RemoteSyslogChannel::registerChannel()
+{
+	Poco::LoggingFactory::defaultFactory().registerChannelClass("RemoteSyslogChannel", new Poco::Instantiator<RemoteSyslogChannel, Poco::Channel>);
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/src/RemoteSyslogListener.cpp b/Net/src/RemoteSyslogListener.cpp
index c04ff6c54..9f9904f1b 100644
--- a/Net/src/RemoteSyslogListener.cpp
+++ b/Net/src/RemoteSyslogListener.cpp
@@ -1,525 +1,525 @@
-//
-// RemoteSyslogListener.cpp
-//
-// $Id: //poco/svn/Net/src/RemoteSyslogListener.cpp#2 $
-//
-// Library: Net
-// Package: Logging
-// Module:  RemoteSyslogListener
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/RemoteSyslogListener.h"
-#include "Poco/Net/RemoteSyslogChannel.h"
-#include "Poco/Net/DatagramSocket.h"
-#include "Poco/Runnable.h"
-#include "Poco/Notification.h"
-#include "Poco/AutoPtr.h"
-#include "Poco/NumberParser.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/DateTimeParser.h"
-#include "Poco/Message.h"
-#include "Poco/LoggingFactory.h"
-#include "Poco/Buffer.h"
-#include <cctype>
-#include <cstddef>
-
-
-namespace Poco {
-namespace Net {
-
-
-//
-// MessageNotification
-//
-
-
-class MessageNotification: public Poco::Notification
-{
-public:
-	MessageNotification(const std::string& msg)
-	{
-		_msg = msg;
-	}
-	
-	~MessageNotification()
-	{
-	}
-	
-	const std::string& message() const
-	{
-		return _msg;
-	}
-	
-private:
-	std::string _msg;
-};
-
-
-//
-// RemoteUDPListener
-//
-
-
-class RemoteUDPListener: public Poco::Runnable
-{
-public:
-	enum
-	{
-		WAITTIME_MILLISEC = 1000,
-		BUFFER_SIZE = 65536
-	};
-	
-	RemoteUDPListener(Poco::NotificationQueue& queue, Poco::UInt16 port);
-	~RemoteUDPListener();
-
-	void run();
-	void safeStop();
-
-private:
-	Poco::NotificationQueue& _queue;
-	DatagramSocket           _socket;
-	bool                     _stopped;
-};
-
-
-RemoteUDPListener::RemoteUDPListener(Poco::NotificationQueue& queue, Poco::UInt16 port):
-	_queue(queue),
-	_socket(Poco::Net::SocketAddress(Poco::Net::IPAddress(), port)),
-	_stopped(true)
-{
-}
-
-
-RemoteUDPListener::~RemoteUDPListener()
-{
-}
-
-
-void RemoteUDPListener::run()
-{
-	poco_assert (_stopped);
-
-	Poco::Buffer<char> buffer(BUFFER_SIZE);
-	_stopped = false;
-	Poco::Timespan waitTime(WAITTIME_MILLISEC* 1000);
-	while (!_stopped)
-	{
-		try
-		{
-			if (_socket.poll(waitTime, Socket::SELECT_READ))
-			{
-				int byteCnt = _socket.receiveBytes(buffer.begin(), BUFFER_SIZE);
-				if (byteCnt > 0)
-				{
-					_queue.enqueueNotification(new MessageNotification(std::string(buffer.begin(), byteCnt)));
-				}
-			}
-		}
-		catch (...)
-		{
-			// lazy exception catching
-		}
-	}
-}
-
-
-void RemoteUDPListener::safeStop()
-{
-	_stopped = true;
-}
-
-
-//
-// SyslogParser
-//
-
-
-class SyslogParser: public Poco::Runnable
-{
-public:
-	static const std::string NILVALUE;
-
-	enum
-	{
-		WAITTIME_MILLISEC = 1000
-	};
-
-	SyslogParser(Poco::NotificationQueue& queue, RemoteSyslogListener* pListener);
-	~SyslogParser();
-
-	void run();
-	void safeStop();
-
-	static Poco::Message::Priority convert(RemoteSyslogChannel::Severity severity);
-
-private:
-	void parse(const std::string& msg);
-	void parsePrio(const std::string& msg, std::size_t& pos, RemoteSyslogChannel::Severity& severity, RemoteSyslogChannel::Facility& fac);
-	void parseNew(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos);
-	void parseBSD(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos);
-
-	static std::string parseUntilSpace(const std::string& msg, std::size_t& pos);
-		/// Parses until it encounters the next space char, returns the string from pos, excluding space
-		/// pos will point past the space char
-
-private:
-	Poco::NotificationQueue& _queue;
-	bool                     _stopped;
-	RemoteSyslogListener*    _pListener;
-};
-
-
-const std::string SyslogParser::NILVALUE("-");
-
-
-SyslogParser::SyslogParser(Poco::NotificationQueue& queue, RemoteSyslogListener* pListener):
-	_queue(queue),
-	_stopped(true),
-	_pListener(pListener)
-{
-	poco_check_ptr (_pListener);
-}
-
-
-SyslogParser::~SyslogParser()
-{
-}
-
-
-void SyslogParser::run()
-{
-	poco_assert (_stopped);
-	_stopped = false;
-	while (!_stopped)
-	{
-		try
-		{
-			Poco::AutoPtr<Poco::Notification> pNf(_queue.waitDequeueNotification(WAITTIME_MILLISEC));
-			if (pNf)
-			{
-				Poco::AutoPtr<MessageNotification> pMsgNf = pNf.cast<MessageNotification>();
-				parse(pMsgNf->message());
-			}
-		}
-		catch (Poco::Exception&)
-		{
-			// parsing exception, what should we do?
-		}
-		catch (...)
-		{
-		}
-	}
-}
-
-
-void SyslogParser::safeStop()
-{
-	_stopped = true;
-}
-
-
-void SyslogParser::parse(const std::string& msg)
-{
-	// <int> -> int: lower 3 bits severity, upper bits: facility
-	std::size_t pos = 0;
-	RemoteSyslogChannel::Severity severity;
-	RemoteSyslogChannel::Facility fac;
-	parsePrio(msg, pos, severity, fac);
-
-	// the next field decide if we parse an old BSD message or a new syslog message
-	// BSD: expects a month value in string form: Jan, Feb...
-	// SYSLOG expects a version number: 1
-	
-	if (std::isdigit(msg[pos]))
-	{
-		parseNew(msg, severity, fac, pos);
-	}
-	else
-	{
-		parseBSD(msg, severity, fac, pos);
-	}
-	poco_assert (pos == msg.size());
-}
-
-
-void SyslogParser::parsePrio(const std::string& msg, std::size_t& pos, RemoteSyslogChannel::Severity& severity, RemoteSyslogChannel::Facility& fac)
-{
-	poco_assert (pos < msg.size());
-	poco_assert (msg[pos] == '<');
-	++pos;
-	std::size_t start = pos;
-	
-	while (pos < msg.size() && std::isdigit(msg[pos]))
-		++pos;
-	
-	poco_assert (msg[pos] == '>');
-	poco_assert (pos - start > 0);
-	std::string valStr = msg.substr(start, pos - start);
-	++pos; // skip the >
-
-	int val = Poco::NumberParser::parse(valStr);
-	poco_assert (val >= 0 && val <= (RemoteSyslogChannel::SYSLOG_LOCAL7 + RemoteSyslogChannel::SYSLOG_DEBUG));
-	
-	Poco::UInt16 pri = static_cast<Poco::UInt16>(val);
-	// now get the lowest 3 bits
-	severity = static_cast<RemoteSyslogChannel::Severity>(pri & 0x0007u);
-	fac = static_cast<RemoteSyslogChannel::Facility>(pri & 0xfff8u);
-}
-
-
-void SyslogParser::parseNew(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos)
-{
-	Poco::Message::Priority prio = convert(severity);
-	// rest of the unparsed header is:
-	// VERSION SP TIMESTAMP SP HOSTNAME SP APP-NAME SP PROCID SP MSGID
-	std::string versionStr(parseUntilSpace(msg, pos));
-	std::string timeStr(parseUntilSpace(msg, pos)); // can be the nilvalue!
-	std::string hostName(parseUntilSpace(msg, pos));
-	std::string appName(parseUntilSpace(msg, pos));
-	std::string procId(parseUntilSpace(msg, pos));
-	std::string msgId(parseUntilSpace(msg, pos));
-	std::string message(msg.substr(pos));
-	pos = msg.size();
-	Poco::DateTime date;
-	int tzd = 0;
-	bool hasDate = Poco::DateTimeParser::tryParse(RemoteSyslogChannel::SYSLOG_TIMEFORMAT, timeStr, date, tzd);
-	Poco::Message logEntry(msgId, message, prio);
-	logEntry["host"] = hostName;
-	logEntry["app"] = appName;
-	
-	if (hasDate)
-		logEntry.setTime(date.timestamp());
-	int lval(0);
-	Poco::NumberParser::tryParse(procId, lval);
-	logEntry.setPid(lval);
-	_pListener->log(logEntry);
-}
-
-
-void SyslogParser::parseBSD(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos)
-{
-	Poco::Message::Priority prio = convert(severity);
-	// rest of the unparsed header is:
-	// "%b %f %H:%M:%S" SP hostname|ipaddress
-	// detect three spaces
-	int spaceCnt = 0;
-	std::size_t start = pos;
-	while (spaceCnt < 3 && pos < msg.size())
-	{
-		if (msg[pos] == ' ')
-		{
-			spaceCnt++;
-			if (spaceCnt == 1)
-			{
-				// size must be 3 chars for month
-				if (pos - start != 3)
-				{
-					// probably a shortened time value, or the hostname
-					// assume hostName
-					Poco::Message logEntry(msg.substr(start, pos-start), msg.substr(pos+1), prio);
-					_pListener->log(logEntry);
-					return;
-				}
-			}
-			else if (spaceCnt == 2)
-			{
-				// a day value!
-				if (!(std::isdigit(msg[pos-1]) && (std::isdigit(msg[pos-2]) || std::isspace(msg[pos-2]))))
-				{
-					// assume the next field is a hostname
-					spaceCnt = 3;
-				}
-			}
-			if (pos + 1 < msg.size() && msg[pos+1] == ' ')
-			{
-				// we have two spaces when the day value is smaller than 10!
-				++pos; // skip one
-			}
-		}
-		++pos;
-	}
-	std::string timeStr(msg.substr(start, pos-start-1));
-	int tzd(0);
-	Poco::DateTime date;
-	int year = date.year(); // year is not included, use the current one
-	bool hasDate = Poco::DateTimeParser::tryParse(RemoteSyslogChannel::BSD_TIMEFORMAT, timeStr, date, tzd);
-	if (hasDate)
-	{
-		int m = date.month();
-		int d = date.day();
-		int h = date.hour();
-		int min = date.minute();
-		int sec = date.second();
-		date = Poco::DateTime(year, m, d, h, min, sec);
-	}
-	// next entry is host SP
-	std::string hostName(parseUntilSpace(msg, pos));
-
-	// TAG: at most 32 alphanumeric chars, ANY non alphannumeric indicates start of message content
-	// ignore: treat everything as content
-	std::string message(msg.substr(pos));
-	pos = msg.size();
-	Poco::Message logEntry(hostName, message, prio);
-	logEntry.setTime(date.timestamp());
-	_pListener->log(logEntry);
-}
-
-
-std::string SyslogParser::parseUntilSpace(const std::string& msg, std::size_t& pos)
-{
-	std::size_t start = pos;
-	while (pos < msg.size() && !std::isspace(msg[pos]))
-		++pos;
-	// skip space
-	++pos;
-	return msg.substr(start, pos-start-1);
-}
-
-
-Poco::Message::Priority SyslogParser::convert(RemoteSyslogChannel::Severity severity)
-{
-	switch (severity)
-	{
-	case RemoteSyslogChannel::SYSLOG_EMERGENCY:
-		return Poco::Message::PRIO_FATAL;
-	case RemoteSyslogChannel::SYSLOG_ALERT:
-		return Poco::Message::PRIO_FATAL;
-	case RemoteSyslogChannel::SYSLOG_CRITICAL:
-		return Poco::Message::PRIO_CRITICAL;
-	case RemoteSyslogChannel::SYSLOG_ERROR:
-		return Poco::Message::PRIO_ERROR;
-	case RemoteSyslogChannel::SYSLOG_WARNING:
-		return Poco::Message::PRIO_WARNING;
-	case RemoteSyslogChannel::SYSLOG_NOTICE:
-		return Poco::Message::PRIO_NOTICE;
-	case RemoteSyslogChannel::SYSLOG_INFORMATIONAL:
-		return Poco::Message::PRIO_INFORMATION;
-	case RemoteSyslogChannel::SYSLOG_DEBUG:
-		return Poco::Message::PRIO_DEBUG;
-	}
-	throw Poco::LogicException("Illegal severity value in message");
-}
-
-
-//
-// RemoteSyslogListener
-//
-
-
-const std::string RemoteSyslogListener::PROP_PORT("port");
-
-
-RemoteSyslogListener::RemoteSyslogListener():
-	_pListener(0),
-	_pParser(0),
-	_listener(),
-	_parser(),
-	_queue(),
-	_port(RemoteSyslogChannel::SYSLOG_PORT)
-{
-}
-
-
-RemoteSyslogListener::RemoteSyslogListener(Poco::UInt16 port):
-	_pListener(0),
-	_pParser(0),
-	_listener(),
-	_parser(),
-	_queue(),
-	_port(port)
-{
-}
-
-
-RemoteSyslogListener::~RemoteSyslogListener()
-{
-}
-
-
-void RemoteSyslogListener::setProperty(const std::string& name, const std::string& value)
-{
-	if (name == PROP_PORT)
-	{
-		int val = Poco::NumberParser::parse(value);
-		if (val > 0 && val < 65536)
-			_port = static_cast<Poco::UInt16>(val);
-		else
-			throw Poco::InvalidArgumentException("Not a valid port number", value);
-	}
-	else 
-	{
-		SplitterChannel::setProperty(name, value);
-	}
-}
-
-
-std::string RemoteSyslogListener::getProperty(const std::string& name) const
-{
-	if (name == PROP_PORT)
-		return Poco::NumberFormatter::format(_port);
-	else	
-		return SplitterChannel::getProperty(name);
-}
-
-
-void RemoteSyslogListener::open()
-{
-	SplitterChannel::open();
-	_pParser = new SyslogParser(_queue, this);
-	_pListener = new RemoteUDPListener(_queue, _port);
-	_parser.start(*_pParser);
-	_listener.start(*_pListener);
-}
-
-
-void RemoteSyslogListener::close()
-{
-	if (_pListener && _pParser)
-	{
-		_pListener->safeStop();
-		_pParser->safeStop();
-		_queue.clear();
-		_listener.join();
-		_parser.join();
-		delete _pListener;
-		delete _pParser;
-		_pListener = 0;
-		_pParser = 0;
-	}
-	SplitterChannel::close();
-}
-
-
-void RemoteSyslogListener::registerChannel()
-{
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("RemoteSyslogListener", new Poco::Instantiator<RemoteSyslogListener, Poco::Channel>);
-}
-
-
-} } // namespace Poco::Net
+//
+// RemoteSyslogListener.cpp
+//
+// $Id: //poco/svn/Net/src/RemoteSyslogListener.cpp#2 $
+//
+// Library: Net
+// Package: Logging
+// Module:  RemoteSyslogListener
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/RemoteSyslogListener.h"
+#include "Poco/Net/RemoteSyslogChannel.h"
+#include "Poco/Net/DatagramSocket.h"
+#include "Poco/Runnable.h"
+#include "Poco/Notification.h"
+#include "Poco/AutoPtr.h"
+#include "Poco/NumberParser.h"
+#include "Poco/NumberFormatter.h"
+#include "Poco/DateTimeParser.h"
+#include "Poco/Message.h"
+#include "Poco/LoggingFactory.h"
+#include "Poco/Buffer.h"
+#include <cctype>
+#include <cstddef>
+
+
+namespace Poco {
+namespace Net {
+
+
+//
+// MessageNotification
+//
+
+
+class MessageNotification: public Poco::Notification
+{
+public:
+	MessageNotification(const std::string& msg)
+	{
+		_msg = msg;
+	}
+	
+	~MessageNotification()
+	{
+	}
+	
+	const std::string& message() const
+	{
+		return _msg;
+	}
+	
+private:
+	std::string _msg;
+};
+
+
+//
+// RemoteUDPListener
+//
+
+
+class RemoteUDPListener: public Poco::Runnable
+{
+public:
+	enum
+	{
+		WAITTIME_MILLISEC = 1000,
+		BUFFER_SIZE = 65536
+	};
+	
+	RemoteUDPListener(Poco::NotificationQueue& queue, Poco::UInt16 port);
+	~RemoteUDPListener();
+
+	void run();
+	void safeStop();
+
+private:
+	Poco::NotificationQueue& _queue;
+	DatagramSocket           _socket;
+	bool                     _stopped;
+};
+
+
+RemoteUDPListener::RemoteUDPListener(Poco::NotificationQueue& queue, Poco::UInt16 port):
+	_queue(queue),
+	_socket(Poco::Net::SocketAddress(Poco::Net::IPAddress(), port)),
+	_stopped(true)
+{
+}
+
+
+RemoteUDPListener::~RemoteUDPListener()
+{
+}
+
+
+void RemoteUDPListener::run()
+{
+	poco_assert (_stopped);
+
+	Poco::Buffer<char> buffer(BUFFER_SIZE);
+	_stopped = false;
+	Poco::Timespan waitTime(WAITTIME_MILLISEC* 1000);
+	while (!_stopped)
+	{
+		try
+		{
+			if (_socket.poll(waitTime, Socket::SELECT_READ))
+			{
+				int byteCnt = _socket.receiveBytes(buffer.begin(), BUFFER_SIZE);
+				if (byteCnt > 0)
+				{
+					_queue.enqueueNotification(new MessageNotification(std::string(buffer.begin(), byteCnt)));
+				}
+			}
+		}
+		catch (...)
+		{
+			// lazy exception catching
+		}
+	}
+}
+
+
+void RemoteUDPListener::safeStop()
+{
+	_stopped = true;
+}
+
+
+//
+// SyslogParser
+//
+
+
+class SyslogParser: public Poco::Runnable
+{
+public:
+	static const std::string NILVALUE;
+
+	enum
+	{
+		WAITTIME_MILLISEC = 1000
+	};
+
+	SyslogParser(Poco::NotificationQueue& queue, RemoteSyslogListener* pListener);
+	~SyslogParser();
+
+	void run();
+	void safeStop();
+
+	static Poco::Message::Priority convert(RemoteSyslogChannel::Severity severity);
+
+private:
+	void parse(const std::string& msg);
+	void parsePrio(const std::string& msg, std::size_t& pos, RemoteSyslogChannel::Severity& severity, RemoteSyslogChannel::Facility& fac);
+	void parseNew(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos);
+	void parseBSD(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos);
+
+	static std::string parseUntilSpace(const std::string& msg, std::size_t& pos);
+		/// Parses until it encounters the next space char, returns the string from pos, excluding space
+		/// pos will point past the space char
+
+private:
+	Poco::NotificationQueue& _queue;
+	bool                     _stopped;
+	RemoteSyslogListener*    _pListener;
+};
+
+
+const std::string SyslogParser::NILVALUE("-");
+
+
+SyslogParser::SyslogParser(Poco::NotificationQueue& queue, RemoteSyslogListener* pListener):
+	_queue(queue),
+	_stopped(true),
+	_pListener(pListener)
+{
+	poco_check_ptr (_pListener);
+}
+
+
+SyslogParser::~SyslogParser()
+{
+}
+
+
+void SyslogParser::run()
+{
+	poco_assert (_stopped);
+	_stopped = false;
+	while (!_stopped)
+	{
+		try
+		{
+			Poco::AutoPtr<Poco::Notification> pNf(_queue.waitDequeueNotification(WAITTIME_MILLISEC));
+			if (pNf)
+			{
+				Poco::AutoPtr<MessageNotification> pMsgNf = pNf.cast<MessageNotification>();
+				parse(pMsgNf->message());
+			}
+		}
+		catch (Poco::Exception&)
+		{
+			// parsing exception, what should we do?
+		}
+		catch (...)
+		{
+		}
+	}
+}
+
+
+void SyslogParser::safeStop()
+{
+	_stopped = true;
+}
+
+
+void SyslogParser::parse(const std::string& msg)
+{
+	// <int> -> int: lower 3 bits severity, upper bits: facility
+	std::size_t pos = 0;
+	RemoteSyslogChannel::Severity severity;
+	RemoteSyslogChannel::Facility fac;
+	parsePrio(msg, pos, severity, fac);
+
+	// the next field decide if we parse an old BSD message or a new syslog message
+	// BSD: expects a month value in string form: Jan, Feb...
+	// SYSLOG expects a version number: 1
+	
+	if (std::isdigit(msg[pos]))
+	{
+		parseNew(msg, severity, fac, pos);
+	}
+	else
+	{
+		parseBSD(msg, severity, fac, pos);
+	}
+	poco_assert (pos == msg.size());
+}
+
+
+void SyslogParser::parsePrio(const std::string& msg, std::size_t& pos, RemoteSyslogChannel::Severity& severity, RemoteSyslogChannel::Facility& fac)
+{
+	poco_assert (pos < msg.size());
+	poco_assert (msg[pos] == '<');
+	++pos;
+	std::size_t start = pos;
+	
+	while (pos < msg.size() && std::isdigit(msg[pos]))
+		++pos;
+	
+	poco_assert (msg[pos] == '>');
+	poco_assert (pos - start > 0);
+	std::string valStr = msg.substr(start, pos - start);
+	++pos; // skip the >
+
+	int val = Poco::NumberParser::parse(valStr);
+	poco_assert (val >= 0 && val <= (RemoteSyslogChannel::SYSLOG_LOCAL7 + RemoteSyslogChannel::SYSLOG_DEBUG));
+	
+	Poco::UInt16 pri = static_cast<Poco::UInt16>(val);
+	// now get the lowest 3 bits
+	severity = static_cast<RemoteSyslogChannel::Severity>(pri & 0x0007u);
+	fac = static_cast<RemoteSyslogChannel::Facility>(pri & 0xfff8u);
+}
+
+
+void SyslogParser::parseNew(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos)
+{
+	Poco::Message::Priority prio = convert(severity);
+	// rest of the unparsed header is:
+	// VERSION SP TIMESTAMP SP HOSTNAME SP APP-NAME SP PROCID SP MSGID
+	std::string versionStr(parseUntilSpace(msg, pos));
+	std::string timeStr(parseUntilSpace(msg, pos)); // can be the nilvalue!
+	std::string hostName(parseUntilSpace(msg, pos));
+	std::string appName(parseUntilSpace(msg, pos));
+	std::string procId(parseUntilSpace(msg, pos));
+	std::string msgId(parseUntilSpace(msg, pos));
+	std::string message(msg.substr(pos));
+	pos = msg.size();
+	Poco::DateTime date;
+	int tzd = 0;
+	bool hasDate = Poco::DateTimeParser::tryParse(RemoteSyslogChannel::SYSLOG_TIMEFORMAT, timeStr, date, tzd);
+	Poco::Message logEntry(msgId, message, prio);
+	logEntry["host"] = hostName;
+	logEntry["app"] = appName;
+	
+	if (hasDate)
+		logEntry.setTime(date.timestamp());
+	int lval(0);
+	Poco::NumberParser::tryParse(procId, lval);
+	logEntry.setPid(lval);
+	_pListener->log(logEntry);
+}
+
+
+void SyslogParser::parseBSD(const std::string& msg, RemoteSyslogChannel::Severity severity, RemoteSyslogChannel::Facility fac, std::size_t& pos)
+{
+	Poco::Message::Priority prio = convert(severity);
+	// rest of the unparsed header is:
+	// "%b %f %H:%M:%S" SP hostname|ipaddress
+	// detect three spaces
+	int spaceCnt = 0;
+	std::size_t start = pos;
+	while (spaceCnt < 3 && pos < msg.size())
+	{
+		if (msg[pos] == ' ')
+		{
+			spaceCnt++;
+			if (spaceCnt == 1)
+			{
+				// size must be 3 chars for month
+				if (pos - start != 3)
+				{
+					// probably a shortened time value, or the hostname
+					// assume hostName
+					Poco::Message logEntry(msg.substr(start, pos-start), msg.substr(pos+1), prio);
+					_pListener->log(logEntry);
+					return;
+				}
+			}
+			else if (spaceCnt == 2)
+			{
+				// a day value!
+				if (!(std::isdigit(msg[pos-1]) && (std::isdigit(msg[pos-2]) || std::isspace(msg[pos-2]))))
+				{
+					// assume the next field is a hostname
+					spaceCnt = 3;
+				}
+			}
+			if (pos + 1 < msg.size() && msg[pos+1] == ' ')
+			{
+				// we have two spaces when the day value is smaller than 10!
+				++pos; // skip one
+			}
+		}
+		++pos;
+	}
+	std::string timeStr(msg.substr(start, pos-start-1));
+	int tzd(0);
+	Poco::DateTime date;
+	int year = date.year(); // year is not included, use the current one
+	bool hasDate = Poco::DateTimeParser::tryParse(RemoteSyslogChannel::BSD_TIMEFORMAT, timeStr, date, tzd);
+	if (hasDate)
+	{
+		int m = date.month();
+		int d = date.day();
+		int h = date.hour();
+		int min = date.minute();
+		int sec = date.second();
+		date = Poco::DateTime(year, m, d, h, min, sec);
+	}
+	// next entry is host SP
+	std::string hostName(parseUntilSpace(msg, pos));
+
+	// TAG: at most 32 alphanumeric chars, ANY non alphannumeric indicates start of message content
+	// ignore: treat everything as content
+	std::string message(msg.substr(pos));
+	pos = msg.size();
+	Poco::Message logEntry(hostName, message, prio);
+	logEntry.setTime(date.timestamp());
+	_pListener->log(logEntry);
+}
+
+
+std::string SyslogParser::parseUntilSpace(const std::string& msg, std::size_t& pos)
+{
+	std::size_t start = pos;
+	while (pos < msg.size() && !std::isspace(msg[pos]))
+		++pos;
+	// skip space
+	++pos;
+	return msg.substr(start, pos-start-1);
+}
+
+
+Poco::Message::Priority SyslogParser::convert(RemoteSyslogChannel::Severity severity)
+{
+	switch (severity)
+	{
+	case RemoteSyslogChannel::SYSLOG_EMERGENCY:
+		return Poco::Message::PRIO_FATAL;
+	case RemoteSyslogChannel::SYSLOG_ALERT:
+		return Poco::Message::PRIO_FATAL;
+	case RemoteSyslogChannel::SYSLOG_CRITICAL:
+		return Poco::Message::PRIO_CRITICAL;
+	case RemoteSyslogChannel::SYSLOG_ERROR:
+		return Poco::Message::PRIO_ERROR;
+	case RemoteSyslogChannel::SYSLOG_WARNING:
+		return Poco::Message::PRIO_WARNING;
+	case RemoteSyslogChannel::SYSLOG_NOTICE:
+		return Poco::Message::PRIO_NOTICE;
+	case RemoteSyslogChannel::SYSLOG_INFORMATIONAL:
+		return Poco::Message::PRIO_INFORMATION;
+	case RemoteSyslogChannel::SYSLOG_DEBUG:
+		return Poco::Message::PRIO_DEBUG;
+	}
+	throw Poco::LogicException("Illegal severity value in message");
+}
+
+
+//
+// RemoteSyslogListener
+//
+
+
+const std::string RemoteSyslogListener::PROP_PORT("port");
+
+
+RemoteSyslogListener::RemoteSyslogListener():
+	_pListener(0),
+	_pParser(0),
+	_listener(),
+	_parser(),
+	_queue(),
+	_port(RemoteSyslogChannel::SYSLOG_PORT)
+{
+}
+
+
+RemoteSyslogListener::RemoteSyslogListener(Poco::UInt16 port):
+	_pListener(0),
+	_pParser(0),
+	_listener(),
+	_parser(),
+	_queue(),
+	_port(port)
+{
+}
+
+
+RemoteSyslogListener::~RemoteSyslogListener()
+{
+}
+
+
+void RemoteSyslogListener::setProperty(const std::string& name, const std::string& value)
+{
+	if (name == PROP_PORT)
+	{
+		int val = Poco::NumberParser::parse(value);
+		if (val > 0 && val < 65536)
+			_port = static_cast<Poco::UInt16>(val);
+		else
+			throw Poco::InvalidArgumentException("Not a valid port number", value);
+	}
+	else 
+	{
+		SplitterChannel::setProperty(name, value);
+	}
+}
+
+
+std::string RemoteSyslogListener::getProperty(const std::string& name) const
+{
+	if (name == PROP_PORT)
+		return Poco::NumberFormatter::format(_port);
+	else	
+		return SplitterChannel::getProperty(name);
+}
+
+
+void RemoteSyslogListener::open()
+{
+	SplitterChannel::open();
+	_pParser = new SyslogParser(_queue, this);
+	_pListener = new RemoteUDPListener(_queue, _port);
+	_parser.start(*_pParser);
+	_listener.start(*_pListener);
+}
+
+
+void RemoteSyslogListener::close()
+{
+	if (_pListener && _pParser)
+	{
+		_pListener->safeStop();
+		_pParser->safeStop();
+		_queue.clear();
+		_listener.join();
+		_parser.join();
+		delete _pListener;
+		delete _pParser;
+		_pListener = 0;
+		_pParser = 0;
+	}
+	SplitterChannel::close();
+}
+
+
+void RemoteSyslogListener::registerChannel()
+{
+	Poco::LoggingFactory::defaultFactory().registerChannelClass("RemoteSyslogListener", new Poco::Instantiator<RemoteSyslogListener, Poco::Channel>);
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/src/SMTPChannel.cpp b/Net/src/SMTPChannel.cpp
index 4ccf4813a..1a5b6266a 100644
--- a/Net/src/SMTPChannel.cpp
+++ b/Net/src/SMTPChannel.cpp
@@ -1,217 +1,217 @@
-//
-// SMTPChannel.cpp
-//
-// $Id: //poco/svn/Net/src/SMTPChannel.cpp#2 $
-//
-// Library: Net
-// Package: Logging
-// Module:  SMTPChannel
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/Net/SMTPChannel.h"
-#include "Poco/Net/MailMessage.h"
-#include "Poco/Net/MailRecipient.h"
-#include "Poco/Net/SMTPClientSession.h"
-#include "Poco/Net/StringPartSource.h"
-#include "Poco/Message.h"
-#include "Poco/DateTimeFormatter.h"
-#include "Poco/DateTimeFormat.h"
-#include "Poco/LocalDateTime.h"
-#include "Poco/LoggingFactory.h"
-#include "Poco/Instantiator.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/FileStream.h"
-#include "Poco/File.h"
-#include "Poco/Environment.h"
-
-
-namespace Poco {
-namespace Net {
-
-
-const std::string SMTPChannel::PROP_MAILHOST("mailhost");
-const std::string SMTPChannel::PROP_SENDER("sender");
-const std::string SMTPChannel::PROP_RECIPIENT("recipient");
-const std::string SMTPChannel::PROP_LOCAL("local");
-const std::string SMTPChannel::PROP_ATTACHMENT("attachment");
-const std::string SMTPChannel::PROP_TYPE("type");
-const std::string SMTPChannel::PROP_DELETE("delete");
-const std::string SMTPChannel::PROP_THROW("throw");
-
-
-SMTPChannel::SMTPChannel():
-	_mailHost("localhost"),
-	_local(true),
-	_type("text/plain"),
-	_delete(false),
-	_throw(false)
-{
-}
-
-		
-SMTPChannel::SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient):
-	_mailHost(mailhost),
-	_sender(sender),
-	_recipient(recipient),
-	_local(true),
-	_type("text/plain"),
-	_delete(false),
-	_throw(false)
-{
-}
-
-
-SMTPChannel::~SMTPChannel()
-{
-	close();
-}
-
-
-void SMTPChannel::open()
-{
-}
-
-	
-void SMTPChannel::close()
-{
-}
-
-	
-void SMTPChannel::log(const Message& msg)
-{
-	try
-	{
-		MailMessage message;
-		message.setSender(_sender);
-		message.addRecipient(MailRecipient(MailRecipient::PRIMARY_RECIPIENT, _recipient));
-		message.setSubject("Log Message from " + _sender);
-		std::stringstream content;
-		content << "Log Message\r\n"
-			<< "===========\r\n\r\n"
-			<< "Host: " << Environment::nodeName() << "\r\n"
-			<< "Logger: " << msg.getSource() << "\r\n";
-
-		if (_local)
-		{
-			DateTime dt(msg.getTime());
-			content	<< "Timestamp: " << DateTimeFormatter::format(LocalDateTime(dt), DateTimeFormat::RFC822_FORMAT) << "\r\n";
-		}
-		else
-			content	<< "Timestamp: " << DateTimeFormatter::format(msg.getTime(), DateTimeFormat::RFC822_FORMAT) << "\r\n";
-
-		content	<< "Priority: " << NumberFormatter::format(msg.getPriority()) << "\r\n"
-			<< "Process ID: " << NumberFormatter::format(msg.getPid()) << "\r\n"
-			<< "Thread: " << msg.getThread() << " (ID: " << msg.getTid() << ")\r\n"
-			<< "Message text: " << msg.getText() << "\r\n\r\n";
-
-		message.addContent(new StringPartSource(content.str()));
-	
-		if (!_attachment.empty())
-		{
-			{
-				Poco::FileInputStream fis(_attachment, std::ios::in | std::ios::binary | std::ios::ate);
-				if (fis.good())
-				{
-					int size = fis.tellg();
-					char* pMem = new char [size];
-					fis.seekg(std::ios::beg);
-					fis.read(pMem, size);
-					message.addAttachment(_attachment, new StringPartSource(std::string(pMem, size), _type, _attachment));
-					delete [] pMem;
-				}
-			}
-			if (_delete) File(_attachment).remove();
-		}
-
-		SMTPClientSession session(_mailHost);
-		session.login();
-		session.sendMessage(message);
-		session.close();
-	} 
-	catch (Exception&) 
-	{ 
-		if (_throw) throw; 
-	}
-}
-
-	
-void SMTPChannel::setProperty(const std::string& name, const std::string& value)
-{
-	if (name == PROP_MAILHOST) 
-		_mailHost = value;
-	else if (name == PROP_SENDER) 
-		_sender = value;
-	else if (name == PROP_RECIPIENT) 
-		_recipient = value;
-	else if (name == PROP_LOCAL) 
-		_local = isTrue(value);
-	else if (name == PROP_ATTACHMENT) 
-		_attachment = value;
-	else if (name == PROP_TYPE) 
-		_type = value;
-	else if (name == PROP_DELETE) 
-		_delete = isTrue(value);
-	else if (name == PROP_THROW) 
-		_throw = isTrue(value);
-	else 
-		Channel::setProperty(name, value);
-}
-
-	
-std::string SMTPChannel::getProperty(const std::string& name) const
-{
-	if (name == PROP_MAILHOST) 
-		return _mailHost;
-	else if (name == PROP_SENDER) 
-		return _sender;
-	else if (name == PROP_RECIPIENT) 
-		return _recipient;
-	else if (name == PROP_LOCAL) 
-		return _local ? "true" : "false";
-	else if (name == PROP_ATTACHMENT) 
-		return _attachment;
-	else if (name == PROP_TYPE) 
-		return _type;
-	else if (name == PROP_DELETE) 
-		return _delete ? "true" : "false";
-	else if (name == PROP_THROW) 
-		return _throw ? "true" : "false";
-	else
-		return Channel::getProperty(name);
-}
-
-
-void SMTPChannel::registerChannel()
-{
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("SMTPChannel", 
-		new Poco::Instantiator<SMTPChannel, Poco::Channel>);
-}
-
-
-} } // namespace Poco::Net
+//
+// SMTPChannel.cpp
+//
+// $Id: //poco/svn/Net/src/SMTPChannel.cpp#2 $
+//
+// Library: Net
+// Package: Logging
+// Module:  SMTPChannel
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/Net/SMTPChannel.h"
+#include "Poco/Net/MailMessage.h"
+#include "Poco/Net/MailRecipient.h"
+#include "Poco/Net/SMTPClientSession.h"
+#include "Poco/Net/StringPartSource.h"
+#include "Poco/Message.h"
+#include "Poco/DateTimeFormatter.h"
+#include "Poco/DateTimeFormat.h"
+#include "Poco/LocalDateTime.h"
+#include "Poco/LoggingFactory.h"
+#include "Poco/Instantiator.h"
+#include "Poco/NumberFormatter.h"
+#include "Poco/FileStream.h"
+#include "Poco/File.h"
+#include "Poco/Environment.h"
+
+
+namespace Poco {
+namespace Net {
+
+
+const std::string SMTPChannel::PROP_MAILHOST("mailhost");
+const std::string SMTPChannel::PROP_SENDER("sender");
+const std::string SMTPChannel::PROP_RECIPIENT("recipient");
+const std::string SMTPChannel::PROP_LOCAL("local");
+const std::string SMTPChannel::PROP_ATTACHMENT("attachment");
+const std::string SMTPChannel::PROP_TYPE("type");
+const std::string SMTPChannel::PROP_DELETE("delete");
+const std::string SMTPChannel::PROP_THROW("throw");
+
+
+SMTPChannel::SMTPChannel():
+	_mailHost("localhost"),
+	_local(true),
+	_type("text/plain"),
+	_delete(false),
+	_throw(false)
+{
+}
+
+		
+SMTPChannel::SMTPChannel(const std::string& mailhost, const std::string& sender, const std::string& recipient):
+	_mailHost(mailhost),
+	_sender(sender),
+	_recipient(recipient),
+	_local(true),
+	_type("text/plain"),
+	_delete(false),
+	_throw(false)
+{
+}
+
+
+SMTPChannel::~SMTPChannel()
+{
+	close();
+}
+
+
+void SMTPChannel::open()
+{
+}
+
+	
+void SMTPChannel::close()
+{
+}
+
+	
+void SMTPChannel::log(const Message& msg)
+{
+	try
+	{
+		MailMessage message;
+		message.setSender(_sender);
+		message.addRecipient(MailRecipient(MailRecipient::PRIMARY_RECIPIENT, _recipient));
+		message.setSubject("Log Message from " + _sender);
+		std::stringstream content;
+		content << "Log Message\r\n"
+			<< "===========\r\n\r\n"
+			<< "Host: " << Environment::nodeName() << "\r\n"
+			<< "Logger: " << msg.getSource() << "\r\n";
+
+		if (_local)
+		{
+			DateTime dt(msg.getTime());
+			content	<< "Timestamp: " << DateTimeFormatter::format(LocalDateTime(dt), DateTimeFormat::RFC822_FORMAT) << "\r\n";
+		}
+		else
+			content	<< "Timestamp: " << DateTimeFormatter::format(msg.getTime(), DateTimeFormat::RFC822_FORMAT) << "\r\n";
+
+		content	<< "Priority: " << NumberFormatter::format(msg.getPriority()) << "\r\n"
+			<< "Process ID: " << NumberFormatter::format(msg.getPid()) << "\r\n"
+			<< "Thread: " << msg.getThread() << " (ID: " << msg.getTid() << ")\r\n"
+			<< "Message text: " << msg.getText() << "\r\n\r\n";
+
+		message.addContent(new StringPartSource(content.str()));
+	
+		if (!_attachment.empty())
+		{
+			{
+				Poco::FileInputStream fis(_attachment, std::ios::in | std::ios::binary | std::ios::ate);
+				if (fis.good())
+				{
+					int size = fis.tellg();
+					char* pMem = new char [size];
+					fis.seekg(std::ios::beg);
+					fis.read(pMem, size);
+					message.addAttachment(_attachment, new StringPartSource(std::string(pMem, size), _type, _attachment));
+					delete [] pMem;
+				}
+			}
+			if (_delete) File(_attachment).remove();
+		}
+
+		SMTPClientSession session(_mailHost);
+		session.login();
+		session.sendMessage(message);
+		session.close();
+	} 
+	catch (Exception&) 
+	{ 
+		if (_throw) throw; 
+	}
+}
+
+	
+void SMTPChannel::setProperty(const std::string& name, const std::string& value)
+{
+	if (name == PROP_MAILHOST) 
+		_mailHost = value;
+	else if (name == PROP_SENDER) 
+		_sender = value;
+	else if (name == PROP_RECIPIENT) 
+		_recipient = value;
+	else if (name == PROP_LOCAL) 
+		_local = isTrue(value);
+	else if (name == PROP_ATTACHMENT) 
+		_attachment = value;
+	else if (name == PROP_TYPE) 
+		_type = value;
+	else if (name == PROP_DELETE) 
+		_delete = isTrue(value);
+	else if (name == PROP_THROW) 
+		_throw = isTrue(value);
+	else 
+		Channel::setProperty(name, value);
+}
+
+	
+std::string SMTPChannel::getProperty(const std::string& name) const
+{
+	if (name == PROP_MAILHOST) 
+		return _mailHost;
+	else if (name == PROP_SENDER) 
+		return _sender;
+	else if (name == PROP_RECIPIENT) 
+		return _recipient;
+	else if (name == PROP_LOCAL) 
+		return _local ? "true" : "false";
+	else if (name == PROP_ATTACHMENT) 
+		return _attachment;
+	else if (name == PROP_TYPE) 
+		return _type;
+	else if (name == PROP_DELETE) 
+		return _delete ? "true" : "false";
+	else if (name == PROP_THROW) 
+		return _throw ? "true" : "false";
+	else
+		return Channel::getProperty(name);
+}
+
+
+void SMTPChannel::registerChannel()
+{
+	Poco::LoggingFactory::defaultFactory().registerChannelClass("SMTPChannel", 
+		new Poco::Instantiator<SMTPChannel, Poco::Channel>);
+}
+
+
+} } // namespace Poco::Net
diff --git a/Net/testsuite/src/SyslogTest.cpp b/Net/testsuite/src/SyslogTest.cpp
index 0e1dae1a9..c9deb327c 100644
--- a/Net/testsuite/src/SyslogTest.cpp
+++ b/Net/testsuite/src/SyslogTest.cpp
@@ -1,215 +1,215 @@
-//
-// SyslogTest.cpp
-//
-// $Id: //poco/svn/Net/testsuite/src/SyslogTest.cpp#2 $
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "SyslogTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/Net/RemoteSyslogChannel.h"
-#include "Poco/Net/RemoteSyslogListener.h"
-#include "Poco/Net/DNS.h"
-#include "Poco/Thread.h"
-#include "Poco/Message.h"
-#include "Poco/AutoPtr.h"
-#include <list>
-
-
-using namespace Poco::Net;
-
-
-class CachingChannel: public Poco::Channel
-	/// Caches the last n Messages in memory
-{
-public:
-	typedef std::list<Poco::Message> Messages;
-	
-	CachingChannel(std::size_t n = 100);
-		/// Creates the CachingChannel. Caches n messages in memory
-
-	~CachingChannel();
-		/// Destroys the CachingChannel.
-
-	void log(const Poco::Message& msg);
-		/// Writes the log message to the cache
-
-	void getMessages(std::vector<Poco::Message>& msg, int offset, int numEntries) const;
-		/// Retrieves numEntries Messages starting with position offset. Most recent messages are first.
-
-	std::size_t getMaxSize() const;
-
-	std::size_t getCurrentSize() const;
-
-private:
-	CachingChannel(const CachingChannel&);
-
-	Messages   _cache;
-	std::size_t _size;
-	std::size_t _maxSize;
-	mutable Poco::FastMutex _mutex;
-};
-
-
-std::size_t CachingChannel::getMaxSize() const
-{
-	return _maxSize;
-}
-
-
-std::size_t CachingChannel::getCurrentSize() const
-{
-	return _size;
-}
-
-
-CachingChannel::CachingChannel(std::size_t n):
-	_cache(),
-	_size(0),
-	_maxSize(n),
-	_mutex()
-{
-}
-
-
-CachingChannel::~CachingChannel()
-{
-}
-
-
-void CachingChannel::log(const Poco::Message& msg)
-{
-	Poco::FastMutex::ScopedLock lock(_mutex);
-	_cache.push_front(msg);
-	if (_size == _maxSize)
-	{
-		_cache.pop_back();
-	}
-	else
-		++_size;
-}
-
-
-void CachingChannel::getMessages(std::vector<Poco::Message>& msg, int offset, int numEntries) const
-{
-	msg.clear();
-	Messages::const_iterator it = _cache.begin();
-
-	while (offset > 0 && it != _cache.end())
-		++it;
-
-	while (numEntries > 0 && it != _cache.end())
-	{
-		msg.push_back(*it);
-		++it;
-	}
-}
-
-
-SyslogTest::SyslogTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-SyslogTest::~SyslogTest()
-{
-}
-
-
-void SyslogTest::testListener()
-{
-	Poco::AutoPtr<RemoteSyslogChannel> channel = new RemoteSyslogChannel();
-	channel->setProperty("loghost", "localhost:51400");
-	channel->open();
-	Poco::AutoPtr<RemoteSyslogListener> listener = new RemoteSyslogListener(51400);
-	listener->open();
-	CachingChannel cl;
-	listener->addChannel(&cl);
-	poco_assert (cl.getCurrentSize() == 0);
-	Poco::Message msg("asource", "amessage", Poco::Message::PRIO_CRITICAL);
-	channel->log(msg);
-	Poco::Thread::sleep(1000);
-	listener->close();
-	channel->close();
-	poco_assert (cl.getCurrentSize() == 1);
-	std::vector<Poco::Message> msgs;
-	cl.getMessages(msgs, 0, 10);
-	poco_assert (msgs.size() == 1);
-	poco_assert (msgs[0].getSource() == "asource");
-	poco_assert (msgs[0].getText() == "amessage");
-	poco_assert (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
-}
-
-
-void SyslogTest::testOldBSD()
-{
-	Poco::AutoPtr<RemoteSyslogChannel> channel = new RemoteSyslogChannel();
-	channel->setProperty("loghost", "localhost:51400");
-	channel->setProperty("format", "bsd");
-	channel->open();
-	Poco::AutoPtr<RemoteSyslogListener> listener = new RemoteSyslogListener(51400);
-	listener->open();
-	CachingChannel cl;
-	listener->addChannel(&cl);
-	poco_assert (cl.getCurrentSize() == 0);
-	Poco::Message msg("asource", "amessage", Poco::Message::PRIO_CRITICAL);
-	channel->log(msg);
-	Poco::Thread::sleep(1000);
-	listener->close();
-	channel->close();
-	poco_assert (cl.getCurrentSize() == 1);
-	std::vector<Poco::Message> msgs;
-	cl.getMessages(msgs, 0, 10);
-	poco_assert (msgs.size() == 1);
-	// the source is lost with old BSD messages: we only send the local host name!
-	poco_assert (msgs[0].getSource() == Poco::Net::DNS::thisHost().name());
-	poco_assert (msgs[0].getText() == "amessage");
-	poco_assert (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
-}
-
-
-void SyslogTest::setUp()
-{
-}
-
-
-void SyslogTest::tearDown()
-{
-}
-
-
-CppUnit::Test* SyslogTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SyslogTest");
-
-	CppUnit_addTest(pSuite, SyslogTest, testListener);
-	CppUnit_addTest(pSuite, SyslogTest, testOldBSD);
-
-	return pSuite;
-}
+//
+// SyslogTest.cpp
+//
+// $Id: //poco/svn/Net/testsuite/src/SyslogTest.cpp#2 $
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "SyslogTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/Net/RemoteSyslogChannel.h"
+#include "Poco/Net/RemoteSyslogListener.h"
+#include "Poco/Net/DNS.h"
+#include "Poco/Thread.h"
+#include "Poco/Message.h"
+#include "Poco/AutoPtr.h"
+#include <list>
+
+
+using namespace Poco::Net;
+
+
+class CachingChannel: public Poco::Channel
+	/// Caches the last n Messages in memory
+{
+public:
+	typedef std::list<Poco::Message> Messages;
+	
+	CachingChannel(std::size_t n = 100);
+		/// Creates the CachingChannel. Caches n messages in memory
+
+	~CachingChannel();
+		/// Destroys the CachingChannel.
+
+	void log(const Poco::Message& msg);
+		/// Writes the log message to the cache
+
+	void getMessages(std::vector<Poco::Message>& msg, int offset, int numEntries) const;
+		/// Retrieves numEntries Messages starting with position offset. Most recent messages are first.
+
+	std::size_t getMaxSize() const;
+
+	std::size_t getCurrentSize() const;
+
+private:
+	CachingChannel(const CachingChannel&);
+
+	Messages   _cache;
+	std::size_t _size;
+	std::size_t _maxSize;
+	mutable Poco::FastMutex _mutex;
+};
+
+
+std::size_t CachingChannel::getMaxSize() const
+{
+	return _maxSize;
+}
+
+
+std::size_t CachingChannel::getCurrentSize() const
+{
+	return _size;
+}
+
+
+CachingChannel::CachingChannel(std::size_t n):
+	_cache(),
+	_size(0),
+	_maxSize(n),
+	_mutex()
+{
+}
+
+
+CachingChannel::~CachingChannel()
+{
+}
+
+
+void CachingChannel::log(const Poco::Message& msg)
+{
+	Poco::FastMutex::ScopedLock lock(_mutex);
+	_cache.push_front(msg);
+	if (_size == _maxSize)
+	{
+		_cache.pop_back();
+	}
+	else
+		++_size;
+}
+
+
+void CachingChannel::getMessages(std::vector<Poco::Message>& msg, int offset, int numEntries) const
+{
+	msg.clear();
+	Messages::const_iterator it = _cache.begin();
+
+	while (offset > 0 && it != _cache.end())
+		++it;
+
+	while (numEntries > 0 && it != _cache.end())
+	{
+		msg.push_back(*it);
+		++it;
+	}
+}
+
+
+SyslogTest::SyslogTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+SyslogTest::~SyslogTest()
+{
+}
+
+
+void SyslogTest::testListener()
+{
+	Poco::AutoPtr<RemoteSyslogChannel> channel = new RemoteSyslogChannel();
+	channel->setProperty("loghost", "localhost:51400");
+	channel->open();
+	Poco::AutoPtr<RemoteSyslogListener> listener = new RemoteSyslogListener(51400);
+	listener->open();
+	CachingChannel cl;
+	listener->addChannel(&cl);
+	poco_assert (cl.getCurrentSize() == 0);
+	Poco::Message msg("asource", "amessage", Poco::Message::PRIO_CRITICAL);
+	channel->log(msg);
+	Poco::Thread::sleep(1000);
+	listener->close();
+	channel->close();
+	poco_assert (cl.getCurrentSize() == 1);
+	std::vector<Poco::Message> msgs;
+	cl.getMessages(msgs, 0, 10);
+	poco_assert (msgs.size() == 1);
+	poco_assert (msgs[0].getSource() == "asource");
+	poco_assert (msgs[0].getText() == "amessage");
+	poco_assert (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
+}
+
+
+void SyslogTest::testOldBSD()
+{
+	Poco::AutoPtr<RemoteSyslogChannel> channel = new RemoteSyslogChannel();
+	channel->setProperty("loghost", "localhost:51400");
+	channel->setProperty("format", "bsd");
+	channel->open();
+	Poco::AutoPtr<RemoteSyslogListener> listener = new RemoteSyslogListener(51400);
+	listener->open();
+	CachingChannel cl;
+	listener->addChannel(&cl);
+	poco_assert (cl.getCurrentSize() == 0);
+	Poco::Message msg("asource", "amessage", Poco::Message::PRIO_CRITICAL);
+	channel->log(msg);
+	Poco::Thread::sleep(1000);
+	listener->close();
+	channel->close();
+	poco_assert (cl.getCurrentSize() == 1);
+	std::vector<Poco::Message> msgs;
+	cl.getMessages(msgs, 0, 10);
+	poco_assert (msgs.size() == 1);
+	// the source is lost with old BSD messages: we only send the local host name!
+	poco_assert (msgs[0].getSource() == Poco::Net::DNS::thisHost().name());
+	poco_assert (msgs[0].getText() == "amessage");
+	poco_assert (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
+}
+
+
+void SyslogTest::setUp()
+{
+}
+
+
+void SyslogTest::tearDown()
+{
+}
+
+
+CppUnit::Test* SyslogTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SyslogTest");
+
+	CppUnit_addTest(pSuite, SyslogTest, testListener);
+	CppUnit_addTest(pSuite, SyslogTest, testOldBSD);
+
+	return pSuite;
+}
diff --git a/Net/testsuite/src/SyslogTest.h b/Net/testsuite/src/SyslogTest.h
index d0b9720da..0c2cbcb7a 100644
--- a/Net/testsuite/src/SyslogTest.h
+++ b/Net/testsuite/src/SyslogTest.h
@@ -1,61 +1,61 @@
-//
-// SyslogTest.h
-//
-// $Id: //poco/svn/Net/testsuite/src/SyslogTest.h#2 $
-//
-// Definition of the SyslogTest class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef SyslogTest_INCLUDED
-#define SyslogTest_INCLUDED
-
-
-#include "Poco/Net/Net.h"
-#include "CppUnit/TestCase.h"
-
-
-class SyslogTest: public CppUnit::TestCase
-{
-public:
-	SyslogTest(const std::string& name);
-	~SyslogTest();
-
-	void testListener();
-	void testOldBSD();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // SyslogTest_INCLUDED
+//
+// SyslogTest.h
+//
+// $Id: //poco/svn/Net/testsuite/src/SyslogTest.h#2 $
+//
+// Definition of the SyslogTest class.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef SyslogTest_INCLUDED
+#define SyslogTest_INCLUDED
+
+
+#include "Poco/Net/Net.h"
+#include "CppUnit/TestCase.h"
+
+
+class SyslogTest: public CppUnit::TestCase
+{
+public:
+	SyslogTest(const std::string& name);
+	~SyslogTest();
+
+	void testListener();
+	void testOldBSD();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // SyslogTest_INCLUDED
diff --git a/XML/include/Poco/DOM/NodeAppender.h b/XML/include/Poco/DOM/NodeAppender.h
index 17ce9c6a3..ea20838f8 100644
--- a/XML/include/Poco/DOM/NodeAppender.h
+++ b/XML/include/Poco/DOM/NodeAppender.h
@@ -1,103 +1,103 @@
-//
-// NodeAppender.h
-//
-// $Id: //poco/svn/XML/include/Poco/DOM/NodeAppender.h#2 $
-//
-// Library: XML
-// Package: DOM
-// Module:  NodeAppender
-//
-// Definition of the NodeAppender class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef DOM_NodeAppender_INCLUDED
-#define DOM_NodeAppender_INCLUDED
-
-
-#include "Poco/XML/XML.h"
-#include "Poco/DOM/Node.h"
-
-
-namespace Poco {
-namespace XML {
-
-
-class AbstractNode;
-class Element;
-
-
-class XML_API NodeAppender
-	/// The NodeAppender class provides a very fast way to
-	/// build larger DOM documents.
-	///
-	/// In the DOM, child nodes are usually appended to a parent
-	/// node using the appendChild() method. For nodes containing
-	/// more than a few children, this method can be quite slow,
-	/// due to the way it's implemented, and because of the 
-	/// requirements of the DOM specification.
-	///
-	/// While the NodeAppender is being used on an Element, no
-	/// children-modifying methods of that Element must be used.
-	///
-	/// This class is not part of the DOM specification.
-{
-public:
-	NodeAppender(Element* parent);
-		/// Creates the NodeAppender for the given parent node,
-		/// which must be an Element.
-
-	~NodeAppender();
-		/// Destroys the NodeAppender.
-
-	void appendChild(Node* newChild);
-		/// Appends the node newChild to the end of the list of children of
-		/// the parent node specified in the constructor.
-		/// If the newChild is already in the tree, it is first removed.
-		///
-		/// NewChild can be a DocumentFragment. In this case, all children
-		/// of the fragment become children of the parent element.
-		///
-		/// In order to speed up the function, no DOM events
-		/// are fired.
-
-private:
-	NodeAppender();
-	NodeAppender(const NodeAppender&);
-	NodeAppender& operator = (const NodeAppender&);
-	
-	Element*      _pParent;
-	AbstractNode* _pLast;
-};
-
-
-} } // namespace Poco::XML
-
-
-#endif // #include "Poco/XML/XML.h"
-
+//
+// NodeAppender.h
+//
+// $Id: //poco/svn/XML/include/Poco/DOM/NodeAppender.h#2 $
+//
+// Library: XML
+// Package: DOM
+// Module:  NodeAppender
+//
+// Definition of the NodeAppender class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef DOM_NodeAppender_INCLUDED
+#define DOM_NodeAppender_INCLUDED
+
+
+#include "Poco/XML/XML.h"
+#include "Poco/DOM/Node.h"
+
+
+namespace Poco {
+namespace XML {
+
+
+class AbstractNode;
+class Element;
+
+
+class XML_API NodeAppender
+	/// The NodeAppender class provides a very fast way to
+	/// build larger DOM documents.
+	///
+	/// In the DOM, child nodes are usually appended to a parent
+	/// node using the appendChild() method. For nodes containing
+	/// more than a few children, this method can be quite slow,
+	/// due to the way it's implemented, and because of the 
+	/// requirements of the DOM specification.
+	///
+	/// While the NodeAppender is being used on an Element, no
+	/// children-modifying methods of that Element must be used.
+	///
+	/// This class is not part of the DOM specification.
+{
+public:
+	NodeAppender(Element* parent);
+		/// Creates the NodeAppender for the given parent node,
+		/// which must be an Element.
+
+	~NodeAppender();
+		/// Destroys the NodeAppender.
+
+	void appendChild(Node* newChild);
+		/// Appends the node newChild to the end of the list of children of
+		/// the parent node specified in the constructor.
+		/// If the newChild is already in the tree, it is first removed.
+		///
+		/// NewChild can be a DocumentFragment. In this case, all children
+		/// of the fragment become children of the parent element.
+		///
+		/// In order to speed up the function, no DOM events
+		/// are fired.
+
+private:
+	NodeAppender();
+	NodeAppender(const NodeAppender&);
+	NodeAppender& operator = (const NodeAppender&);
+	
+	Element*      _pParent;
+	AbstractNode* _pLast;
+};
+
+
+} } // namespace Poco::XML
+
+
+#endif // #include "Poco/XML/XML.h"
+
diff --git a/XML/src/NodeAppender.cpp b/XML/src/NodeAppender.cpp
index 2df4877b1..2883b2884 100644
--- a/XML/src/NodeAppender.cpp
+++ b/XML/src/NodeAppender.cpp
@@ -1,104 +1,104 @@
-//
-// NodeAppender.cpp
-//
-// $Id: //poco/svn/XML/src/NodeAppender.cpp#2 $
-//
-// Library: XML
-// Package: DOM
-// Module:  NodeAppender
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "Poco/DOM/NodeAppender.h"
-#include "Poco/DOM/Element.h"
-#include "Poco/DOM/DOMException.h"
-
-
-namespace Poco {
-namespace XML {
-
-
-NodeAppender::NodeAppender(Element* parent):
-	_pParent(parent),
-	_pLast(0)
-{
-	poco_check_ptr (parent);
-
-	_pLast = static_cast<AbstractNode*>(_pParent->lastChild());
-}
-
-
-NodeAppender::~NodeAppender()
-{
-}
-
-
-void NodeAppender::appendChild(Node* newChild)
-{
-	poco_check_ptr (newChild);
-	poco_assert (_pLast == 0 || _pLast->_pNext == 0);
-
-	if (static_cast<AbstractNode*>(newChild)->_pOwner != _pParent->_pOwner)
-		throw DOMException(DOMException::WRONG_DOCUMENT_ERR);
-		
-	if (newChild->nodeType() == Node::DOCUMENT_FRAGMENT_NODE)
-	{
-		AbstractContainerNode* pFrag = static_cast<AbstractContainerNode*>(newChild);
-		AbstractNode* pChild = pFrag->_pFirstChild;
-		if (pChild)
-		{
-			if (_pLast)
-				_pLast->_pNext = pChild;
-			else
-				_pParent->_pFirstChild = pChild;
-			while (pChild)
-			{
-				_pLast = pChild;
-				pChild->_pParent = _pParent;
-				pChild = pChild->_pNext;
-			}
-			pFrag->_pFirstChild = 0;
-		}
-	}
-	else
-	{
-		AbstractNode* pAN = static_cast<AbstractNode*>(newChild);
-		pAN->duplicate();
-		if (pAN->_pParent) 
-			pAN->_pParent->removeChild(pAN);
-		pAN->_pParent = _pParent;
-		if (_pLast)
-			_pLast->_pNext = pAN;
-		else
-			_pParent->_pFirstChild = pAN;
-		_pLast = pAN;
-	}
-}
-
-
-} } // namespace Poco::XML
+//
+// NodeAppender.cpp
+//
+// $Id: //poco/svn/XML/src/NodeAppender.cpp#2 $
+//
+// Library: XML
+// Package: DOM
+// Module:  NodeAppender
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "Poco/DOM/NodeAppender.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/DOMException.h"
+
+
+namespace Poco {
+namespace XML {
+
+
+NodeAppender::NodeAppender(Element* parent):
+	_pParent(parent),
+	_pLast(0)
+{
+	poco_check_ptr (parent);
+
+	_pLast = static_cast<AbstractNode*>(_pParent->lastChild());
+}
+
+
+NodeAppender::~NodeAppender()
+{
+}
+
+
+void NodeAppender::appendChild(Node* newChild)
+{
+	poco_check_ptr (newChild);
+	poco_assert (_pLast == 0 || _pLast->_pNext == 0);
+
+	if (static_cast<AbstractNode*>(newChild)->_pOwner != _pParent->_pOwner)
+		throw DOMException(DOMException::WRONG_DOCUMENT_ERR);
+		
+	if (newChild->nodeType() == Node::DOCUMENT_FRAGMENT_NODE)
+	{
+		AbstractContainerNode* pFrag = static_cast<AbstractContainerNode*>(newChild);
+		AbstractNode* pChild = pFrag->_pFirstChild;
+		if (pChild)
+		{
+			if (_pLast)
+				_pLast->_pNext = pChild;
+			else
+				_pParent->_pFirstChild = pChild;
+			while (pChild)
+			{
+				_pLast = pChild;
+				pChild->_pParent = _pParent;
+				pChild = pChild->_pNext;
+			}
+			pFrag->_pFirstChild = 0;
+		}
+	}
+	else
+	{
+		AbstractNode* pAN = static_cast<AbstractNode*>(newChild);
+		pAN->duplicate();
+		if (pAN->_pParent) 
+			pAN->_pParent->removeChild(pAN);
+		pAN->_pParent = _pParent;
+		if (_pLast)
+			_pLast->_pNext = pAN;
+		else
+			_pParent->_pFirstChild = pAN;
+		_pLast = pAN;
+	}
+}
+
+
+} } // namespace Poco::XML
diff --git a/XML/testsuite/src/NodeAppenderTest.cpp b/XML/testsuite/src/NodeAppenderTest.cpp
index 4ffc5c0e3..e28f31cdc 100644
--- a/XML/testsuite/src/NodeAppenderTest.cpp
+++ b/XML/testsuite/src/NodeAppenderTest.cpp
@@ -1,162 +1,162 @@
-//
-// NodeAppenderTest.cpp
-//
-// $Id: //poco/svn/XML/testsuite/src/NodeAppenderTest.cpp#1 $
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#include "NodeAppenderTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/DOM/NodeAppender.h"
-#include "Poco/DOM/Element.h"
-#include "Poco/DOM/Document.h"
-#include "Poco/DOM/DocumentFragment.h"
-#include "Poco/DOM/AutoPtr.h"
-
-
-using Poco::XML::NodeAppender;
-using Poco::XML::Element;
-using Poco::XML::Document;
-using Poco::XML::DocumentFragment;
-using Poco::XML::AutoPtr;
-using Poco::XML::XMLString;
-
-
-NodeAppenderTest::NodeAppenderTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-NodeAppenderTest::~NodeAppenderTest()
-{
-}
-
-
-void NodeAppenderTest::testAppendNode()
-{
-	AutoPtr<Document> pDoc = new Document;
-	AutoPtr<Element>  pRoot = pDoc->createElement("root");
-	pDoc->appendChild(pRoot);
-	
-	NodeAppender appender(pRoot);
-	
-	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem3 = pDoc->createElement("elem");
-
-	appender.appendChild(pElem1);
-	appender.appendChild(pElem2);
-	appender.appendChild(pElem3);
-
-	assert (pRoot->firstChild() == pElem1);
-	assert (pRoot->lastChild() == pElem3);
-	
-	assert (pElem1->nextSibling() == pElem2);
-	assert (pElem2->nextSibling() == pElem3);
-	assert (pElem3->nextSibling() == 0);
-	
-	assert (pElem1->previousSibling() == 0);
-	assert (pElem2->previousSibling() == pElem1);	
-	assert (pElem3->previousSibling() == pElem2);	
-	
-	assert (pElem1->parentNode() == pRoot);
-	assert (pElem2->parentNode() == pRoot);
-	assert (pElem3->parentNode() == pRoot);
-}
-
-
-void NodeAppenderTest::testAppendNodeList()
-{
-	AutoPtr<Document> pDoc = new Document;
-	AutoPtr<Element>  pRoot = pDoc->createElement("root");
-	pDoc->appendChild(pRoot);
-	
-	NodeAppender appender(pRoot);
-	
-	AutoPtr<DocumentFragment> pFrag1 = pDoc->createDocumentFragment();
-	AutoPtr<DocumentFragment> pFrag2 = pDoc->createDocumentFragment();
-	AutoPtr<DocumentFragment> pFrag3 = pDoc->createDocumentFragment();
-	
-	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem3 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem4 = pDoc->createElement("elem");
-
-	pFrag2->appendChild(pElem1);
-	pFrag2->appendChild(pElem2);
-	pFrag2->appendChild(pElem3);
-	
-	pFrag3->appendChild(pElem4);
-	
-	appender.appendChild(pFrag1);
-	assert (pRoot->firstChild() == 0);
-	
-	appender.appendChild(pFrag2);
-	assert (pRoot->firstChild() == pElem1);
-	assert (pRoot->lastChild() == pElem3);
-
-	assert (pElem1->nextSibling() == pElem2);
-	assert (pElem2->nextSibling() == pElem3);
-	assert (pElem3->nextSibling() == 0);
-	
-	assert (pElem1->previousSibling() == 0);
-	assert (pElem2->previousSibling() == pElem1);	
-	assert (pElem3->previousSibling() == pElem2);	
-	
-	assert (pElem1->parentNode() == pRoot);
-	assert (pElem2->parentNode() == pRoot);
-	assert (pElem3->parentNode() == pRoot);
-	
-	appender.appendChild(pFrag3);
-	assert (pRoot->lastChild() == pElem4);
-	assert (pElem4->parentNode() == pRoot);
-	assert (pElem3->nextSibling() == pElem4);
-	assert (pElem4->previousSibling() == pElem3);
-}
-
-
-void NodeAppenderTest::setUp()
-{
-}
-
-
-void NodeAppenderTest::tearDown()
-{
-}
-
-
-CppUnit::Test* NodeAppenderTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("NodeAppenderTest");
-
-	CppUnit_addTest(pSuite, NodeAppenderTest, testAppendNode);
-	CppUnit_addTest(pSuite, NodeAppenderTest, testAppendNodeList);
-
-	return pSuite;
-}
+//
+// NodeAppenderTest.cpp
+//
+// $Id: //poco/svn/XML/testsuite/src/NodeAppenderTest.cpp#1 $
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#include "NodeAppenderTest.h"
+#include "CppUnit/TestCaller.h"
+#include "CppUnit/TestSuite.h"
+#include "Poco/DOM/NodeAppender.h"
+#include "Poco/DOM/Element.h"
+#include "Poco/DOM/Document.h"
+#include "Poco/DOM/DocumentFragment.h"
+#include "Poco/DOM/AutoPtr.h"
+
+
+using Poco::XML::NodeAppender;
+using Poco::XML::Element;
+using Poco::XML::Document;
+using Poco::XML::DocumentFragment;
+using Poco::XML::AutoPtr;
+using Poco::XML::XMLString;
+
+
+NodeAppenderTest::NodeAppenderTest(const std::string& name): CppUnit::TestCase(name)
+{
+}
+
+
+NodeAppenderTest::~NodeAppenderTest()
+{
+}
+
+
+void NodeAppenderTest::testAppendNode()
+{
+	AutoPtr<Document> pDoc = new Document;
+	AutoPtr<Element>  pRoot = pDoc->createElement("root");
+	pDoc->appendChild(pRoot);
+	
+	NodeAppender appender(pRoot);
+	
+	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
+	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
+	AutoPtr<Element> pElem3 = pDoc->createElement("elem");
+
+	appender.appendChild(pElem1);
+	appender.appendChild(pElem2);
+	appender.appendChild(pElem3);
+
+	assert (pRoot->firstChild() == pElem1);
+	assert (pRoot->lastChild() == pElem3);
+	
+	assert (pElem1->nextSibling() == pElem2);
+	assert (pElem2->nextSibling() == pElem3);
+	assert (pElem3->nextSibling() == 0);
+	
+	assert (pElem1->previousSibling() == 0);
+	assert (pElem2->previousSibling() == pElem1);	
+	assert (pElem3->previousSibling() == pElem2);	
+	
+	assert (pElem1->parentNode() == pRoot);
+	assert (pElem2->parentNode() == pRoot);
+	assert (pElem3->parentNode() == pRoot);
+}
+
+
+void NodeAppenderTest::testAppendNodeList()
+{
+	AutoPtr<Document> pDoc = new Document;
+	AutoPtr<Element>  pRoot = pDoc->createElement("root");
+	pDoc->appendChild(pRoot);
+	
+	NodeAppender appender(pRoot);
+	
+	AutoPtr<DocumentFragment> pFrag1 = pDoc->createDocumentFragment();
+	AutoPtr<DocumentFragment> pFrag2 = pDoc->createDocumentFragment();
+	AutoPtr<DocumentFragment> pFrag3 = pDoc->createDocumentFragment();
+	
+	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
+	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
+	AutoPtr<Element> pElem3 = pDoc->createElement("elem");
+	AutoPtr<Element> pElem4 = pDoc->createElement("elem");
+
+	pFrag2->appendChild(pElem1);
+	pFrag2->appendChild(pElem2);
+	pFrag2->appendChild(pElem3);
+	
+	pFrag3->appendChild(pElem4);
+	
+	appender.appendChild(pFrag1);
+	assert (pRoot->firstChild() == 0);
+	
+	appender.appendChild(pFrag2);
+	assert (pRoot->firstChild() == pElem1);
+	assert (pRoot->lastChild() == pElem3);
+
+	assert (pElem1->nextSibling() == pElem2);
+	assert (pElem2->nextSibling() == pElem3);
+	assert (pElem3->nextSibling() == 0);
+	
+	assert (pElem1->previousSibling() == 0);
+	assert (pElem2->previousSibling() == pElem1);	
+	assert (pElem3->previousSibling() == pElem2);	
+	
+	assert (pElem1->parentNode() == pRoot);
+	assert (pElem2->parentNode() == pRoot);
+	assert (pElem3->parentNode() == pRoot);
+	
+	appender.appendChild(pFrag3);
+	assert (pRoot->lastChild() == pElem4);
+	assert (pElem4->parentNode() == pRoot);
+	assert (pElem3->nextSibling() == pElem4);
+	assert (pElem4->previousSibling() == pElem3);
+}
+
+
+void NodeAppenderTest::setUp()
+{
+}
+
+
+void NodeAppenderTest::tearDown()
+{
+}
+
+
+CppUnit::Test* NodeAppenderTest::suite()
+{
+	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("NodeAppenderTest");
+
+	CppUnit_addTest(pSuite, NodeAppenderTest, testAppendNode);
+	CppUnit_addTest(pSuite, NodeAppenderTest, testAppendNodeList);
+
+	return pSuite;
+}
diff --git a/XML/testsuite/src/NodeAppenderTest.h b/XML/testsuite/src/NodeAppenderTest.h
index 9f68a6823..4dbc6afbb 100644
--- a/XML/testsuite/src/NodeAppenderTest.h
+++ b/XML/testsuite/src/NodeAppenderTest.h
@@ -1,61 +1,61 @@
-//
-// NodeAppenderTest.h
-//
-// $Id: //poco/svn/XML/testsuite/src/NodeAppenderTest.h#1 $
-//
-// Definition of the NodeAppenderTest class.
-//
-// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// 
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-#ifndef NodeAppenderTest_INCLUDED
-#define NodeAppenderTest_INCLUDED
-
-
-#include "Poco/XML/XML.h"
-#include "CppUnit/TestCase.h"
-
-
-class NodeAppenderTest: public CppUnit::TestCase
-{
-public:
-	NodeAppenderTest(const std::string& name);
-	~NodeAppenderTest();
-
-	void testAppendNode();
-	void testAppendNodeList();
-
-	void setUp();
-	void tearDown();
-
-	static CppUnit::Test* suite();
-
-private:
-};
-
-
-#endif // NodeAppenderTest_INCLUDED
+//
+// NodeAppenderTest.h
+//
+// $Id: //poco/svn/XML/testsuite/src/NodeAppenderTest.h#1 $
+//
+// Definition of the NodeAppenderTest class.
+//
+// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef NodeAppenderTest_INCLUDED
+#define NodeAppenderTest_INCLUDED
+
+
+#include "Poco/XML/XML.h"
+#include "CppUnit/TestCase.h"
+
+
+class NodeAppenderTest: public CppUnit::TestCase
+{
+public:
+	NodeAppenderTest(const std::string& name);
+	~NodeAppenderTest();
+
+	void testAppendNode();
+	void testAppendNodeList();
+
+	void setUp();
+	void tearDown();
+
+	static CppUnit::Test* suite();
+
+private:
+};
+
+
+#endif // NodeAppenderTest_INCLUDED