sources from main repository

2024-12-12 18:20:26 +01:00 · 2006-12-22 09:31:08 +00:00 · 2006-12-22 09:31:08 +00:00 · 772a1021dc
commit 772a1021dc
parent 15193c3465
768 changed files with 5910 additions and 840 deletions
--- a/Foundation/Foundation_vs71.sln
+++ b/Foundation/Foundation_vs71.sln
@ -21,25 +21,43 @@ EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		debug_shared = debug_shared
+		debug_static = debug_static
 		release_shared = release_shared
+		release_static = release_static
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared.ActiveCfg = debug_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared.Build.0 = debug_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static.ActiveCfg = debug_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static.Build.0 = debug_static|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared.ActiveCfg = release_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared.Build.0 = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static.ActiveCfg = release_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static.Build.0 = release_static|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared.ActiveCfg = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared.Build.0 = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static.ActiveCfg = debug_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static.Build.0 = debug_static|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared.ActiveCfg = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared.Build.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static.ActiveCfg = release_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static.Build.0 = release_static|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared.ActiveCfg = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static.Build.0 = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static.Build.0 = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared.Build.0 = debug_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static.ActiveCfg = debug_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static.Build.0 = debug_static|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared.ActiveCfg = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared.Build.0 = release_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static.ActiveCfg = release_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static.Build.0 = release_static|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
--- a/Foundation/Foundation_vs71.vcproj
+++ b/Foundation/Foundation_vs71.vcproj
--- a/Foundation/Foundation_vs80.sln
+++ b/Foundation/Foundation_vs80.sln
@ -5,8 +5,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs80.vcproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
 		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs80.vcproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
@ -19,25 +19,43 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Win32 = debug_shared|Win32
+		debug_static|Win32 = debug_static|Win32
 		release_shared|Win32 = release_shared|Win32
+		release_static|Win32 = release_static|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static|Win32.Build.0 = debug_static|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static|Win32.ActiveCfg = release_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static|Win32.Build.0 = release_static|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static|Win32.Build.0 = debug_static|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static|Win32.ActiveCfg = release_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static|Win32.Build.0 = release_static|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static|Win32.Build.0 = debug_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static|Win32.Build.0 = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static|Win32.Build.0 = debug_static|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.ActiveCfg = release_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.Build.0 = release_static|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Foundation/Foundation_vs80.vcproj
+++ b/Foundation/Foundation_vs80.vcproj
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Foundation/Makefile#1 $
+# $Id: //poco/Main/Foundation/Makefile#35 $
 #
 # Makefile for Poco Foundation
 #
--- a/Foundation/include/Poco/ASCIIEncoding.h
+++ b/Foundation/include/Poco/ASCIIEncoding.h
@ -1,7 +1,7 @@
 //
 // ASCIIEncoding.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ASCIIEncoding.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ASCIIEncoding.h#2 $
 //
 // Library: Foundation
 // Package: Text
--- a/Foundation/include/Poco/AbstractCache.h
+++ b/Foundation/include/Poco/AbstractCache.h
@ -1,7 +1,7 @@
 //
 // AbstractCache.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AbstractCache.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AbstractCache.h#12 $
 //
 // Library: Foundation
 // Package: Cache
--- a/Foundation/include/Poco/AbstractDelegate.h
+++ b/Foundation/include/Poco/AbstractDelegate.h
@ -1,7 +1,7 @@
 //
 // AbstractDelegate.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AbstractDelegate.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AbstractDelegate.h#3 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/AbstractEvent.h
+++ b/Foundation/include/Poco/AbstractEvent.h
@ -1,7 +1,7 @@
 //
 // AbstractEvent.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AbstractEvent.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AbstractEvent.h#8 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/AbstractObserver.h
+++ b/Foundation/include/Poco/AbstractObserver.h
@ -1,7 +1,7 @@
 //
 // AbstractObserver.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AbstractObserver.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AbstractObserver.h#1 $
 //
 // Library: Foundation
 // Package: Notifications
--- a/Foundation/include/Poco/AbstractPriorityDelegate.h
+++ b/Foundation/include/Poco/AbstractPriorityDelegate.h
@ -1,7 +1,7 @@
 //
 // AbstractPriorityDelegate.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AbstractPriorityDelegate.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AbstractPriorityDelegate.h#3 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/AbstractStrategy.h
+++ b/Foundation/include/Poco/AbstractStrategy.h
@ -1,7 +1,7 @@
 //
 // AbstractStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AbstractStrategy.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AbstractStrategy.h#3 $
 //
 // Library: Foundation
 // Package: Cache
--- a/Foundation/include/Poco/ActiveDispatcher.h
+++ b/Foundation/include/Poco/ActiveDispatcher.h
@ -1,7 +1,7 @@
 //
 // ActiveDispatcher.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ActiveDispatcher.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ActiveDispatcher.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/ActiveMethod.h
+++ b/Foundation/include/Poco/ActiveMethod.h
@ -1,7 +1,7 @@
 //
 // ActiveMethod.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ActiveMethod.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ActiveMethod.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/ActiveResult.h
+++ b/Foundation/include/Poco/ActiveResult.h
@ -1,7 +1,7 @@
 //
 // ActiveResult.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ActiveResult.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ActiveResult.h#4 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/ActiveRunnable.h
+++ b/Foundation/include/Poco/ActiveRunnable.h
@ -1,7 +1,7 @@
 //
 // ActiveRunnable.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ActiveRunnable.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ActiveRunnable.h#3 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/ActiveStarter.h
+++ b/Foundation/include/Poco/ActiveStarter.h
@ -1,7 +1,7 @@
 //
 // ActiveStarter.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ActiveStarter.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ActiveStarter.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Activity.h
+++ b/Foundation/include/Poco/Activity.h
@ -1,7 +1,7 @@
 //
 // Activity.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Activity.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Activity.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Any.h
+++ b/Foundation/include/Poco/Any.h
@ -1,7 +1,7 @@
 //
 // Any.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Any.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Any.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/ArchiveStrategy.h
+++ b/Foundation/include/Poco/ArchiveStrategy.h
@ -1,7 +1,7 @@
 //
 // ArchiveStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ArchiveStrategy.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ArchiveStrategy.h#2 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/AsyncChannel.h
+++ b/Foundation/include/Poco/AsyncChannel.h
@ -1,7 +1,7 @@
 //
 // AsyncChannel.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AsyncChannel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AsyncChannel.h#2 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/AutoPtr.h
+++ b/Foundation/include/Poco/AutoPtr.h
@ -1,7 +1,7 @@
 //
 // AutoPtr.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AutoPtr.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AutoPtr.h#6 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/AutoReleasePool.h
+++ b/Foundation/include/Poco/AutoReleasePool.h
@ -1,7 +1,7 @@
 //
 // AutoReleasePool.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/AutoReleasePool.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/AutoReleasePool.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Base64Decoder.h
+++ b/Foundation/include/Poco/Base64Decoder.h
@ -1,7 +1,7 @@
 //
 // Base64Decoder.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Base64Decoder.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Base64Decoder.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/Base64Encoder.h
+++ b/Foundation/include/Poco/Base64Encoder.h
@ -1,7 +1,7 @@
 //
 // Base64Encoder.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Base64Encoder.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Base64Encoder.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/BasicEvent.h
+++ b/Foundation/include/Poco/BasicEvent.h
@ -1,7 +1,7 @@
 //
 // BasicEvent.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/BasicEvent.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/BasicEvent.h#2 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/BinaryReader.h
+++ b/Foundation/include/Poco/BinaryReader.h
@ -1,7 +1,7 @@
 //
 // BinaryReader.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/BinaryReader.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/BinaryReader.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/BinaryWriter.h
+++ b/Foundation/include/Poco/BinaryWriter.h
@ -1,7 +1,7 @@
 //
 // BinaryWriter.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/BinaryWriter.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/BinaryWriter.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/Buffer.h
+++ b/Foundation/include/Poco/Buffer.h
@ -1,7 +1,7 @@
 //
 // Buffer.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Buffer.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Buffer.h#3 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/BufferAllocator.h
+++ b/Foundation/include/Poco/BufferAllocator.h
@ -1,7 +1,7 @@
 //
 // BufferAllocator.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/BufferAllocator.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/BufferAllocator.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h
+++ b/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h
@ -1,7 +1,7 @@
 //
 // BufferedBidirectionalStreamBuf.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/BufferedStreamBuf.h
+++ b/Foundation/include/Poco/BufferedStreamBuf.h
@ -1,7 +1,7 @@
 //
 // BufferedStreamBuf.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/BufferedStreamBuf.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/BufferedStreamBuf.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/Bugcheck.h
+++ b/Foundation/include/Poco/Bugcheck.h
@ -1,7 +1,7 @@
 //
 // Bugcheck.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Bugcheck.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Bugcheck.h#3 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/ByteOrder.h
+++ b/Foundation/include/Poco/ByteOrder.h
@ -1,7 +1,7 @@
 //
 // ByteOrder.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ByteOrder.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ByteOrder.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Channel.h
+++ b/Foundation/include/Poco/Channel.h
@ -1,7 +1,7 @@
 //
 // Channel.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Channel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Channel.h#2 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/ClassLibrary.h
+++ b/Foundation/include/Poco/ClassLibrary.h
@ -1,7 +1,7 @@
 //
 // ClassLibrary.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ClassLibrary.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ClassLibrary.h#2 $
 //
 // Library: Foundation
 // Package: SharedLibrary
--- a/Foundation/include/Poco/ClassLoader.h
+++ b/Foundation/include/Poco/ClassLoader.h
@ -1,7 +1,7 @@
 //
 // ClassLoader.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ClassLoader.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ClassLoader.h#2 $
 //
 // Library: Foundation
 // Package: SharedLibrary
--- a/Foundation/include/Poco/CompareFunctions.h
+++ b/Foundation/include/Poco/CompareFunctions.h
@ -1,7 +1,7 @@
 //
 // CompareFunctions.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/CompareFunctions.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/CompareFunctions.h#2 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@ -1,7 +1,7 @@
 //
 // Config.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Config.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Config.h#3 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Configurable.h
+++ b/Foundation/include/Poco/Configurable.h
@ -1,7 +1,7 @@
 //
 // Configurable.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Configurable.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Configurable.h#3 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/ConsoleChannel.h
+++ b/Foundation/include/Poco/ConsoleChannel.h
@ -1,7 +1,7 @@
 //
 // ConsoleChannel.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ConsoleChannel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ConsoleChannel.h#2 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/CountingStream.h
+++ b/Foundation/include/Poco/CountingStream.h
@ -1,7 +1,7 @@
 //
 // CountingStream.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/CountingStream.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/CountingStream.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/DateTime.h
+++ b/Foundation/include/Poco/DateTime.h
@ -1,7 +1,7 @@
 //
 // DateTime.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DateTime.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DateTime.h#3 $
 //
 // Library: Foundation
 // Package: DateTime
--- a/Foundation/include/Poco/DateTimeFormat.h
+++ b/Foundation/include/Poco/DateTimeFormat.h
@ -1,7 +1,7 @@
 //
 // DateTimeFormat.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DateTimeFormat.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DateTimeFormat.h#2 $
 //
 // Library: Foundation
 // Package: DateTime
--- a/Foundation/include/Poco/DateTimeFormatter.h
+++ b/Foundation/include/Poco/DateTimeFormatter.h
@ -1,7 +1,7 @@
 //
 // DateTimeFormatter.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DateTimeFormatter.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DateTimeFormatter.h#2 $
 //
 // Library: Foundation
 // Package: DateTime
--- a/Foundation/include/Poco/DateTimeParser.h
+++ b/Foundation/include/Poco/DateTimeParser.h
@ -1,7 +1,7 @@
 //
 // DateTimeParser.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DateTimeParser.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DateTimeParser.h#2 $
 //
 // Library: Foundation
 // Package: DateTime
--- a/Foundation/include/Poco/Debugger.h
+++ b/Foundation/include/Poco/Debugger.h
@ -1,7 +1,7 @@
 //
 // Debugger.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Debugger.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Debugger.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/DefaultStrategy.h
+++ b/Foundation/include/Poco/DefaultStrategy.h
@ -1,7 +1,7 @@
 //
 // DefaultStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DefaultStrategy.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DefaultStrategy.h#2 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/DeflatingStream.h
+++ b/Foundation/include/Poco/DeflatingStream.h
@ -1,7 +1,7 @@
 //
 // DeflatingStream.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DeflatingStream.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DeflatingStream.h#2 $
 //
 // Library: Foundation
 // Package: Streams
--- a/Foundation/include/Poco/Delegate.h
+++ b/Foundation/include/Poco/Delegate.h
@ -1,7 +1,7 @@
 //
 // Delegate.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Delegate.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Delegate.h#5 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/DigestEngine.h
+++ b/Foundation/include/Poco/DigestEngine.h
@ -1,7 +1,7 @@
 //
 // DigestEngine.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DigestEngine.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DigestEngine.h#2 $
 //
 // Library: Foundation
 // Package: Crypt
--- a/Foundation/include/Poco/DigestStream.h
+++ b/Foundation/include/Poco/DigestStream.h
@ -1,7 +1,7 @@
 //
 // DigestStream.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DigestStream.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DigestStream.h#2 $
 //
 // Library: Foundation
 // Package: Crypt
--- a/Foundation/include/Poco/DirectoryIterator.h
+++ b/Foundation/include/Poco/DirectoryIterator.h
@ -1,7 +1,7 @@
 //
 // DirectoryIterator.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DirectoryIterator.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator.h#5 $
 //
 // Library: Foundation
 // Package: Filesystem
@ -58,10 +58,12 @@ class Foundation_API DirectoryIterator
 	/// DirectoryIterator has some limitations:
 	///   * only forward iteration (++) is supported
 	///   * an iterator copied from another one will always
-	///   * point to the same file as the original iterator,
-	///   * even is the original iterator has been advanced
+	///     point to the same file as the original iterator,
+	///     even is the original iterator has been advanced
 	///     (all copies of an iterator share their state with
 	///     the original iterator)
+	///   * because of this you should only use the prefix 
+	///     increment operator
 {
 public:
 	DirectoryIterator();
@ -94,11 +96,16 @@ public:
 	DirectoryIterator& operator = (const std::string& path);
 	
 	DirectoryIterator& operator ++ ();   // prefix
+	
+	//@ deprecated
 	DirectoryIterator operator ++ (int); // postfix
+		/// Please use the prefix increment operator instead.
+	
 	const File& operator * () const;
 	File& operator * ();
 	const File* operator -> () const;
 	File* operator -> ();
+	
 	bool operator == (const DirectoryIterator& iterator) const;
 	bool operator != (const DirectoryIterator& iterator) const;

--- a/Foundation/include/Poco/DirectoryIterator_UNIX.h
+++ b/Foundation/include/Poco/DirectoryIterator_UNIX.h
@ -1,7 +1,7 @@
 //
 // DirectoryIterator_UNIX.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DirectoryIterator_UNIX.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_UNIX.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/DirectoryIterator_VMS.h
+++ b/Foundation/include/Poco/DirectoryIterator_VMS.h
@ -1,7 +1,7 @@
 //
 // DirectoryIterator_VMS.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DirectoryIterator_VMS.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_VMS.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/DirectoryIterator_WIN32.h
+++ b/Foundation/include/Poco/DirectoryIterator_WIN32.h
@ -1,7 +1,7 @@
 //
 // DirectoryIterator_WIN32.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DirectoryIterator_WIN32.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_WIN32.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/DirectoryIterator_WIN32U.h
+++ b/Foundation/include/Poco/DirectoryIterator_WIN32U.h
@ -1,7 +1,7 @@
 //
 // DirectoryIterator_WIN32U.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DirectoryIterator_WIN32U.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_WIN32U.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/DynamicFactory.h
+++ b/Foundation/include/Poco/DynamicFactory.h
@ -1,7 +1,7 @@
 //
 // DynamicFactory.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/DynamicFactory.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/DynamicFactory.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Environment.h
+++ b/Foundation/include/Poco/Environment.h
@ -1,7 +1,7 @@
 //
 // Environment.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Environment.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Environment.h#3 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Environment_UNIX.h
+++ b/Foundation/include/Poco/Environment_UNIX.h
@ -1,7 +1,7 @@
 //
 // Environment_UNIX.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Environment_UNIX.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Environment_UNIX.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Environment_VMS.h
+++ b/Foundation/include/Poco/Environment_VMS.h
@ -1,7 +1,7 @@
 //
 // Environment_VMS.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Environment_VMS.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Environment_VMS.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Environment_WIN32.h
+++ b/Foundation/include/Poco/Environment_WIN32.h
@ -1,7 +1,7 @@
 //
 // Environment_WIN32.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Environment_WIN32.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Environment_WIN32.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Environment_WIN32U.h
+++ b/Foundation/include/Poco/Environment_WIN32U.h
@ -1,7 +1,7 @@
 //
 // Environment_WIN32U.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Environment_WIN32U.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Environment_WIN32U.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/ErrorHandler.h
+++ b/Foundation/include/Poco/ErrorHandler.h
@ -1,7 +1,7 @@
 //
 // ErrorHandler.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ErrorHandler.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ErrorHandler.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Event.h
+++ b/Foundation/include/Poco/Event.h
@ -1,7 +1,7 @@
 //
 // Event.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Event.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Event.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/EventArgs.h
+++ b/Foundation/include/Poco/EventArgs.h
@ -1,7 +1,7 @@
 //
 // EventArgs.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/EventArgs.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/EventArgs.h#2 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/EventLogChannel.h
+++ b/Foundation/include/Poco/EventLogChannel.h
@ -1,7 +1,7 @@
 //
 // EventLogChannel.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/EventLogChannel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/EventLogChannel.h#4 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/Event_POSIX.h
+++ b/Foundation/include/Poco/Event_POSIX.h
@ -1,7 +1,7 @@
 //
 // Event_POSIX.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Event_POSIX.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Event_POSIX.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Event_WIN32.h
+++ b/Foundation/include/Poco/Event_WIN32.h
@ -1,7 +1,7 @@
 //
 // Event_WIN32.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Event_WIN32.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Event_WIN32.h#2 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Exception.h
+++ b/Foundation/include/Poco/Exception.h
@ -1,7 +1,7 @@
 //
 // Exception.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Exception.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Exception.h#3 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/ExpirationDecorator.h
+++ b/Foundation/include/Poco/ExpirationDecorator.h
@ -1,7 +1,7 @@
 //
 // ExpirationDecorator.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ExpirationDecorator.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ExpirationDecorator.h#2 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/Expire.h
+++ b/Foundation/include/Poco/Expire.h
@ -1,7 +1,7 @@
 //
 // Expire.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Expire.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Expire.h#4 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/ExpireCache.h
+++ b/Foundation/include/Poco/ExpireCache.h
@ -1,7 +1,7 @@
 //
 // ExpireCache.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ExpireCache.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ExpireCache.h#4 $
 //
 // Library: Foundation
 // Package: Cache
--- a/Foundation/include/Poco/ExpireLRUCache.h
+++ b/Foundation/include/Poco/ExpireLRUCache.h
@ -1,7 +1,7 @@
 //
 // ExpireLRUCache.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ExpireLRUCache.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ExpireLRUCache.h#5 $
 //
 // Library: Foundation
 // Package: Cache
--- a/Foundation/include/Poco/ExpireStrategy.h
+++ b/Foundation/include/Poco/ExpireStrategy.h
@ -1,7 +1,7 @@
 //
 // ExpireStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ExpireStrategy.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/ExpireStrategy.h#5 $
 //
 // Library: Foundation
 // Package: Cache
--- a/Foundation/include/Poco/FIFOEvent.h
+++ b/Foundation/include/Poco/FIFOEvent.h
@ -1,7 +1,7 @@
 //
 // FIFOEvent.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FIFOEvent.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FIFOEvent.h#2 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/FIFOStrategy.h
+++ b/Foundation/include/Poco/FIFOStrategy.h
@ -1,7 +1,7 @@
 //
 // FIFOStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FIFOStrategy.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FIFOStrategy.h#3 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/FPEnvironment.h
+++ b/Foundation/include/Poco/FPEnvironment.h
@ -1,7 +1,7 @@
 //
 // FPEnvironment.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FPEnvironment.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FPEnvironment.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/FPEnvironment_C99.h
+++ b/Foundation/include/Poco/FPEnvironment_C99.h
@ -1,7 +1,7 @@
 //
 // FPEnvironment_C99.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FPEnvironment_C99.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FPEnvironment_C99.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/FPEnvironment_DEC.h
+++ b/Foundation/include/Poco/FPEnvironment_DEC.h
@ -1,7 +1,7 @@
 //
 // FPEnvironment_DEC.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FPEnvironment_DEC.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FPEnvironment_DEC.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/FPEnvironment_DUMMY.h
+++ b/Foundation/include/Poco/FPEnvironment_DUMMY.h
@ -1,7 +1,7 @@
 //
 // FPEnvironment_DUMMY.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FPEnvironment_DUMMY.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FPEnvironment_DUMMY.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/FPEnvironment_SUN.h
+++ b/Foundation/include/Poco/FPEnvironment_SUN.h
@ -1,7 +1,7 @@
 //
 // FPEnvironment_SUN.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FPEnvironment_SUN.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FPEnvironment_SUN.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/FPEnvironment_WIN32.h
+++ b/Foundation/include/Poco/FPEnvironment_WIN32.h
@ -1,7 +1,7 @@
 //
 // FPEnvironment_WIN32.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FPEnvironment_WIN32.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FPEnvironment_WIN32.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/File.h
+++ b/Foundation/include/Poco/File.h
@ -1,7 +1,7 @@
 //
 // File.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/File.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/File.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/FileChannel.h
+++ b/Foundation/include/Poco/FileChannel.h
@ -1,7 +1,7 @@
 //
 // FileChannel.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FileChannel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FileChannel.h#2 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/FileStreamFactory.h
+++ b/Foundation/include/Poco/FileStreamFactory.h
@ -1,7 +1,7 @@
 //
 // FileStreamFactory.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FileStreamFactory.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FileStreamFactory.h#2 $
 //
 // Library: Foundation
 // Package: URI
--- a/Foundation/include/Poco/File_UNIX.h
+++ b/Foundation/include/Poco/File_UNIX.h
@ -1,7 +1,7 @@
 //
 // File_UNIX.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/File_UNIX.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/File_UNIX.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/File_VMS.h
+++ b/Foundation/include/Poco/File_VMS.h
@ -1,7 +1,7 @@
 //
 // File_VMS.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/File_VMS.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/File_VMS.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/File_WIN32.h
+++ b/Foundation/include/Poco/File_WIN32.h
@ -1,7 +1,7 @@
 //
 // File_WIN32.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/File_WIN32.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/File_WIN32.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/File_WIN32U.h
+++ b/Foundation/include/Poco/File_WIN32U.h
@ -1,7 +1,7 @@
 //
 // File_WIN32U.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/File_WIN32U.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/File_WIN32U.h#2 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/Format.h
+++ b/Foundation/include/Poco/Format.h
@ -1,7 +1,7 @@
 //
 // Format.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Format.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Format.h#2 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Formatter.h
+++ b/Foundation/include/Poco/Formatter.h
@ -1,7 +1,7 @@
 //
 // Formatter.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Formatter.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Formatter.h#2 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/FormattingChannel.h
+++ b/Foundation/include/Poco/FormattingChannel.h
@ -1,7 +1,7 @@
 //
 // FormattingChannel.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FormattingChannel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/FormattingChannel.h#3 $
 //
 // Library: Foundation
 // Package: Logging
--- a/Foundation/include/Poco/Foundation.h
+++ b/Foundation/include/Poco/Foundation.h
@ -1,7 +1,7 @@
 //
 // Foundation.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Foundation.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Foundation.h#6 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Glob.h
+++ b/Foundation/include/Poco/Glob.h
@ -1,7 +1,7 @@
 //
 // Glob.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Glob.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Glob.h#3 $
 //
 // Library: Foundation
 // Package: Filesystem
--- a/Foundation/include/Poco/HMACEngine.h
+++ b/Foundation/include/Poco/HMACEngine.h
@ -1,7 +1,7 @@
 //
 // HMACEngine.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/HMACEngine.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/HMACEngine.h#2 $
 //
 // Library: Foundation
 // Package: Crypt
--- a/Foundation/include/Poco/Hash.h
+++ b/Foundation/include/Poco/Hash.h
@ -1,7 +1,7 @@
 //
 // Hash.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Hash.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/Hash.h#2 $
 //
 // Library: Foundation
 // Package: Hashing
--- a/Foundation/include/Poco/HashFunction.h
+++ b/Foundation/include/Poco/HashFunction.h
@ -1,7 +1,7 @@
 //
 // HashFunction.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/HashFunction.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/HashFunction.h#3 $
 //
 // Library: Foundation
 // Package: Hashing
--- a/Foundation/include/Poco/HashMap.h
+++ b/Foundation/include/Poco/HashMap.h
@ -1,7 +1,7 @@
 //
 // HashMap.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/HashMap.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/HashMap.h#2 $
 //
 // Library: Foundation
 // Package: Hashing
--- a/Foundation/include/Poco/HashSet.h
+++ b/Foundation/include/Poco/HashSet.h
@ -1,7 +1,7 @@
 //
 // HashSet.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/HashSet.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/HashSet.h#2 $
 //
 // Library: Foundation
 // Package: Hashing
--- a/Show More
+++ b/Show More