From 666fe51a7bbfa61f88d88e75bf11ca1d78321f95 Mon Sep 17 00:00:00 2001
From: Aleksandar Fabijanic <alex@pocoproject.org>
Date: Wed, 26 Dec 2012 22:24:49 -0600
Subject: [PATCH] fixed VS90 Foundation projects

---
 Foundation/Foundation_x64_vs90.vcproj         | 98 ++++++++++++++++---
 .../testsuite/TestSuite_x64_vs90.vcproj       | 42 +++++++-
 Net/src/NetworkInterface.cpp                  |  4 +-
 3 files changed, 124 insertions(+), 20 deletions(-)

diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj
index 886387cc9..3ee699ca6 100644
--- a/Foundation/Foundation_x64_vs90.vcproj
+++ b/Foundation/Foundation_x64_vs90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Foundation"
 	ProjectGUID="{8164D41D-B053-405B-826C-CF37AC0EF176}"
 	RootNamespace="Foundation"
@@ -518,14 +518,6 @@
 					RelativePath=".\src\Debugger.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\src\DynamicAny.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\DynamicAnyHolder.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\src\Environment.cpp"
 					>
@@ -1030,6 +1022,10 @@
 					RelativePath=".\src\NumberParser.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\NumericString.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\RefCountedObject.cpp"
 					>
@@ -1038,10 +1034,6 @@
 					RelativePath=".\src\String.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\src\NumericString.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\src\StringTokenizer.cpp"
 					>
@@ -1138,6 +1130,10 @@
 					RelativePath=".\include\Poco\Exception.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\FIFOBuffer.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\Format.h"
 					>
@@ -1310,6 +1306,10 @@
 					RelativePath=".\src\DeflatingStream.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferStream.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\FileStream.cpp"
 					>
@@ -1506,6 +1506,10 @@
 					RelativePath=".\include\Poco\DeflatingStream.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\FIFOBufferStream.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\FileStream.h"
 					>
@@ -5580,6 +5584,10 @@
 					RelativePath=".\src\Latin1Encoding.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\Latin2Encoding.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\Latin9Encoding.cpp"
 					>
@@ -5616,6 +5624,10 @@
 					RelativePath=".\src\UTF16Encoding.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\UTF32Encoding.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\UTF8Encoding.cpp"
 					>
@@ -5624,6 +5636,14 @@
 					RelativePath=".\src\UTF8String.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\Windows1250Encoding.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\Windows1251Encoding.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\Windows1252Encoding.cpp"
 					>
@@ -5640,6 +5660,10 @@
 					RelativePath=".\include\Poco\Latin1Encoding.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\Latin2Encoding.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\Latin9Encoding.h"
 					>
@@ -5676,6 +5700,10 @@
 					RelativePath=".\include\Poco\UTF16Encoding.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\UTF32Encoding.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\UTF8Encoding.h"
 					>
@@ -5684,6 +5712,14 @@
 					RelativePath=".\include\Poco\UTF8String.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\Poco\Windows1250Encoding.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\Windows1251Encoding.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\Poco\Windows1252Encoding.h"
 					>
@@ -6002,6 +6038,42 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Dynamic"
+			>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath=".\include\Poco\Dynamic\Pair.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\Dynamic\Struct.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\Dynamic\Var.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\Poco\Dynamic\VarHolder.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath=".\src\Var.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\VarHolder.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
 		<File
 			RelativePath="..\DLLVersion.rc"
 			>
diff --git a/Foundation/testsuite/TestSuite_x64_vs90.vcproj b/Foundation/testsuite/TestSuite_x64_vs90.vcproj
index 927785125..7acc5cd06 100644
--- a/Foundation/testsuite/TestSuite_x64_vs90.vcproj
+++ b/Foundation/testsuite/TestSuite_x64_vs90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="TestSuite"
 	ProjectGUID="{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	Keyword="Win32Proj"
@@ -535,6 +535,10 @@
 					RelativePath=".\src\AnyTest.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\ArrayTest.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\AutoPtrTest.cpp"
 					>
@@ -555,10 +559,6 @@
 					RelativePath=".\src\CoreTestSuite.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\src\DynamicAnyTest.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\src\DynamicFactoryTest.cpp"
 					>
@@ -627,6 +627,10 @@
 					RelativePath=".\src\AnyTest.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\ArrayTest.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\AutoPtrTest.h"
 					>
@@ -735,6 +739,10 @@
 					RelativePath=".\src\CountingStreamTest.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferStreamTest.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\FileStreamTest.cpp"
 					>
@@ -795,6 +803,10 @@
 					RelativePath=".\src\CountingStreamTest.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\FIFOBufferStreamTest.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\FileStreamTest.h"
 					>
@@ -1785,6 +1797,26 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Dynamic"
+			>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath=".\src\VarTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath=".\src\VarTest.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp
index a5c680383..74c6e8017 100644
--- a/Net/src/NetworkInterface.cpp
+++ b/Net/src/NetworkInterface.cpp
@@ -788,8 +788,8 @@ NetworkInterface NetworkInterface::forAddress(const IPAddress& addr)
 
 	for (; it != end; ++it)
 	{
-		const unsigned count = it->second.addressList().size();
-		for (unsigned i = 0; i < count; ++i)
+		const std::size_t count = it->second.addressList().size();
+		for (int i = 0; i < count; ++i)
 		{
 			if (it->second.address(i) == addr)
 				return it->second;