Permalink
Browse files

GH #224: building 1.5.1 on Windows for x64

  • Loading branch information...
1 parent 0c50f62 commit 36025ccc335d98b2d5202980d98193d8620b4fe2 @aleks-f aleks-f committed Jun 18, 2013
View
@@ -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)
View
@@ -33,6 +33,9 @@ Mathaus Mendel
Arturo Castro
Adrian Imboden
Matej Knopp
+Patrice Tarabbia
+Lucas Clemente
+Karl Reid
--
$Id$
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -64,7 +64,7 @@ class Data_API RowIterator
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);
@@ -350,7 +350,7 @@ class Data_API StatementImpl
return new InternalBulkExtraction<C>(*pData,
pCol,
static_cast<Poco::UInt32>(getExtractionLimit()),
- Position(currentDataSet()));
+ Position(static_cast<Poco::UInt32>(currentDataSet())));
}
template <class T>
View
@@ -45,7 +45,7 @@ namespace Poco {
namespace Data {
-const int RowIterator::POSITION_END = std::numeric_limits<std::size_t>::max();
+const std::size_t RowIterator::POSITION_END = std::numeric_limits<std::size_t>::max();
RowIterator::RowIterator(RecordSet* pRecordSet, bool positionEnd):
@@ -116,7 +116,7 @@ class RecursiveDirectoryIteratorImpl
/// Function which implements the logic of determining
/// recursion depth.
{
- return stack.size();
+ return static_cast<Poco::UInt16>(stack.size());
}
UInt16 _maxDepth;
View
@@ -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.

0 comments on commit 36025cc

Please sign in to comment.