diff --git a/CHANGELOG b/CHANGELOG
index 5e3d2b42c..9e788fee3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -93,6 +93,8 @@ Release 1.5.2 (2013-06-24)
threadpool that will be used to start an Activity(Patrice Tarabbia)
- fixed GH #212: JSONConfiguration was missing from the vs90 project(Patrice Tarabbia)
- fixed GH #220: add qualifiers for FPEnvironment in C99 (Lucas Clemente)
+- fixed GH #222: HTTPCookie doesn't support expiry times in the past (Karl Reid)
+- fixed GH #224: building 1.5.1 on Windows for x64
Release 1.5.1 (2013-01-11)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e1cb8b150..7709743ed 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -33,6 +33,9 @@ Mathaus Mendel
Arturo Castro
Adrian Imboden
Matej Knopp
+Patrice Tarabbia
+Lucas Clemente
+Karl Reid
--
$Id$
diff --git a/Data/Data_x64_vs110.vcxproj b/Data/Data_x64_vs110.vcxproj
index 87ed20362..428ccaea8 100644
--- a/Data/Data_x64_vs110.vcxproj
+++ b/Data/Data_x64_vs110.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,82 +32,82 @@
Data
Win32Proj
-
-
+
+
StaticLibrary
MultiByte
v110
-
+
StaticLibrary
MultiByte
v110
-
+
StaticLibrary
MultiByte
v110
-
+
StaticLibrary
MultiByte
v110
-
+
DynamicLibrary
MultiByte
v110
-
+
DynamicLibrary
MultiByte
v110
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- PocoData64d
- PocoDatamdd
- PocoDatamtd
- PocoData64
- PocoDatamd
- PocoDatamt
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ PocoData64d
+ PocoDatamdd
+ PocoDatamtd
+ PocoData64
+ PocoDatamd
+ PocoDatamt
-
+
Disabled
.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -120,7 +120,7 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
@@ -138,7 +138,7 @@
MachineX64
-
+
Disabled
OnlyExplicitInline
@@ -153,9 +153,9 @@
true
true
true
-
+
Level3
-
+
Default
%(DisableSpecificWarnings)
@@ -172,7 +172,7 @@
MachineX64
-
+
Disabled
.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -185,7 +185,7 @@
true
true
true
-
+
..\lib64\PocoDatamtd.pdb
Level3
ProgramDatabase
@@ -196,7 +196,7 @@
..\lib64\PocoDatamtd.lib
-
+
Disabled
OnlyExplicitInline
@@ -211,9 +211,9 @@
true
true
true
-
+
Level3
-
+
Default
%(DisableSpecificWarnings)
@@ -221,7 +221,7 @@
..\lib64\PocoDatamt.lib
-
+
Disabled
.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -234,7 +234,7 @@
true
true
true
-
+
..\lib64\PocoDatamdd.pdb
Level3
ProgramDatabase
@@ -245,7 +245,7 @@
..\lib64\PocoDatamdd.lib
-
+
Disabled
OnlyExplicitInline
@@ -260,9 +260,9 @@
true
true
true
-
+
Level3
-
+
Default
%(DisableSpecificWarnings)
@@ -271,93 +271,101 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
+
+
+
+
+
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h
index 43ff3ddbb..8ba0998d0 100644
--- a/Data/include/Poco/Data/RowIterator.h
+++ b/Data/include/Poco/Data/RowIterator.h
@@ -64,7 +64,7 @@ public:
typedef Row* pointer;
typedef Row& reference;
- static const int POSITION_END;
+ static const std::size_t POSITION_END;
/// End position indicator.
RowIterator(RecordSet* pRecordSet, bool positionEnd);
diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h
index cc931cd1e..0a1ae4f22 100644
--- a/Data/include/Poco/Data/StatementImpl.h
+++ b/Data/include/Poco/Data/StatementImpl.h
@@ -350,7 +350,7 @@ private:
return new InternalBulkExtraction(*pData,
pCol,
static_cast(getExtractionLimit()),
- Position(currentDataSet()));
+ Position(static_cast(currentDataSet())));
}
template
diff --git a/Data/src/RowIterator.cpp b/Data/src/RowIterator.cpp
index a286b2d61..1acd1a64c 100644
--- a/Data/src/RowIterator.cpp
+++ b/Data/src/RowIterator.cpp
@@ -45,7 +45,7 @@ namespace Poco {
namespace Data {
-const int RowIterator::POSITION_END = std::numeric_limits::max();
+const std::size_t RowIterator::POSITION_END = std::numeric_limits::max();
RowIterator::RowIterator(RecordSet* pRecordSet, bool positionEnd):
diff --git a/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h b/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
index 1aca7accd..167aefed6 100644
--- a/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
+++ b/Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
@@ -116,7 +116,7 @@ private:
/// Function which implements the logic of determining
/// recursion depth.
{
- return stack.size();
+ return static_cast(stack.size());
}
UInt16 _maxDepth;
diff --git a/buildwin.cmd b/buildwin.cmd
index e122367a1..c2fd68a15 100644
--- a/buildwin.cmd
+++ b/buildwin.cmd
@@ -49,14 +49,21 @@ set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH%
rem VS_VERSION {71 | 80 | 90 | 100 | 110}
if "%1"=="" goto usage
set VS_VERSION=vs%1
+set VS_64_BIT_ENV=VC\bin\x86_amd64\vcvarsx86_amd64.bat
if not defined VCINSTALLDIR (
- if %1==71 (call "%VS71COMNTOOLS%vsvars32.bat") else (
- if %1==80 (call "%VS80COMNTOOLS%vsvars32.bat") else (
- if %1==90 (call "%VS90COMNTOOLS%vsvars32.bat") else (
- if %1==100 (call "%VS100COMNTOOLS%vsvars32.bat") else (
- if %1==110 (call "%VS110COMNTOOLS%vsvars32.bat")
- ))))
+ if %VS_VERSION%==vs71 (call "%VS71COMNTOOLS%vsvars32.bat") else (
+ if %VS_VERSION%==vs80 (call "%VS80COMNTOOLS%vsvars32.bat") else (
+ if %VS_VERSION%==vs90 (
+ if %5==x64 (call "%VS90COMNTOOLS%..\..\%VS_64_BIT_ENV%") else (
+ call "%VS90COMNTOOLS%vsvars32.bat")) else (
+ if %VS_VERSION%==vs100 (
+ if %5==x64 (call "%VS100COMNTOOLS%..\..\%VS_64_BIT_ENV%") else (
+ call "%VS100COMNTOOLS%vsvars32.bat")) else (
+ if %VS_VERSION%==vs110 (
+ if %5==x64 (call "%VS110COMNTOOLS%..\..\%VS_64_BIT_ENV%") else (
+ call "%VS110COMNTOOLS%vsvars32.bat")
+ )))))
if not defined VSINSTALLDIR (
echo Error: No Visual C++ environment found.