generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-17 03:03:23 +02:00
Code Issues Projects Releases Wiki Activity

GH #224: building 1.5.1 on Windows for x64

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2013-06-18 00:02:04 -05:00
parent 0c50f6241c
commit 36025ccc33
8 changed files with 175 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -93,6 +93,8 @@ Release 1.5.2 (2013-06-24)
threadpool that will be used to start an Activity(Patrice Tarabbia) 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 #212: JSONConfiguration was missing from the vs90 project(Patrice Tarabbia)
- fixed GH #220: add qualifiers for FPEnvironment in C99 (Lucas Clemente) - 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) Release 1.5.1 (2013-01-11)

3
CONTRIBUTORS
View File

@@ -33,6 +33,9 @@ Mathaus Mendel
Arturo Castro Arturo Castro
Adrian Imboden Adrian Imboden
Matej Knopp Matej Knopp
Patrice Tarabbia
Lucas Clemente
Karl Reid
-- --
$Id$ $Id$

298
Data/Data_x64_vs110.vcxproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|x64"> <ProjectConfiguration Include="debug_shared|x64">
@@ -32,82 +32,82 @@
<RootNamespace>Data</RootNamespace> <RootNamespace>Data</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"/> <ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
<Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
<Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
<Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
<Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">..\bin64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">..\bin64\</OutDir>
<IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\$(Configuration)\</IntDir>
<LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">true</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
<OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;">..\bin64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">..\bin64\</OutDir>
<IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\$(Configuration)\</IntDir>
<LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
<OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">..\lib64\</OutDir>
<IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
<IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
<IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
<IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\$(Configuration)\</IntDir>
<TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;">PocoData64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoData64d</TargetName>
<TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;">PocoDatamdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoDatamdd</TargetName>
<TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;">PocoDatamtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoDatamtd</TargetName>
<TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;">PocoData64</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoData64</TargetName>
<TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;">PocoDatamd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoDatamd</TargetName>
<TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;">PocoDatamt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoDatamt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|x64&apos;"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -120,7 +120,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -138,7 +138,7 @@
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|x64&apos;"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -153,9 +153,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@@ -172,7 +172,7 @@
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -185,7 +185,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib64\PocoDatamtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\PocoDatamtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -196,7 +196,7 @@
<OutputFile>..\lib64\PocoDatamtd.lib</OutputFile> <OutputFile>..\lib64\PocoDatamtd.lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -211,9 +211,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@@ -221,7 +221,7 @@
<OutputFile>..\lib64\PocoDatamt.lib</OutputFile> <OutputFile>..\lib64\PocoDatamt.lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -234,7 +234,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib64\PocoDatamdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\PocoDatamdd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -245,7 +245,7 @@
<OutputFile>..\lib64\PocoDatamdd.lib</OutputFile> <OutputFile>..\lib64\PocoDatamdd.lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -260,9 +260,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@@ -271,93 +271,101 @@
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\Poco\Data\AbstractBinder.h"/> <ClInclude Include="include\Poco\Data\AbstractBinder.h" />
<ClInclude Include="include\Poco\Data\AbstractBinding.h"/> <ClInclude Include="include\Poco\Data\AbstractBinding.h" />
<ClInclude Include="include\Poco\Data\AbstractExtraction.h"/> <ClInclude Include="include\Poco\Data\AbstractExtraction.h" />
<ClInclude Include="include\Poco\Data\AbstractExtractor.h"/> <ClInclude Include="include\Poco\Data\AbstractExtractor.h" />
<ClInclude Include="include\Poco\Data\AbstractPreparation.h"/> <ClInclude Include="include\Poco\Data\AbstractPreparation.h" />
<ClInclude Include="include\Poco\Data\AbstractPreparator.h"/> <ClInclude Include="include\Poco\Data\AbstractPreparator.h" />
<ClInclude Include="include\Poco\Data\AbstractSessionImpl.h"/> <ClInclude Include="include\Poco\Data\AbstractSessionImpl.h" />
<ClInclude Include="include\Poco\Data\AutoTransaction.h"/> <ClInclude Include="include\Poco\Data\AutoTransaction.h" />
<ClInclude Include="include\Poco\Data\Binding.h"/> <ClInclude Include="include\Poco\Data\Binding.h" />
<ClInclude Include="include\Poco\Data\Bulk.h"/> <ClInclude Include="include\Poco\Data\Bulk.h" />
<ClInclude Include="include\Poco\Data\BulkBinding.h"/> <ClInclude Include="include\Poco\Data\BulkBinding.h" />
<ClInclude Include="include\Poco\Data\BulkExtraction.h"/> <ClInclude Include="include\Poco\Data\BulkExtraction.h" />
<ClInclude Include="include\Poco\Data\Column.h"/> <ClInclude Include="include\Poco\Data\Column.h" />
<ClInclude Include="include\Poco\Data\Connector.h"/> <ClInclude Include="include\Poco\Data\Connector.h" />
<ClInclude Include="include\Poco\Data\Constants.h"/> <ClInclude Include="include\Poco\Data\Constants.h" />
<ClInclude Include="include\Poco\Data\Data.h"/> <ClInclude Include="include\Poco\Data\Data.h" />
<ClInclude Include="include\Poco\Data\DataException.h"/> <ClInclude Include="include\Poco\Data\DataException.h" />
<ClInclude Include="include\Poco\Data\Date.h"/> <ClInclude Include="include\Poco\Data\Date.h" />
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/> <ClInclude Include="include\Poco\Data\DynamicDateTime.h" />
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/> <ClInclude Include="include\Poco\Data\DynamicLOB.h" />
<ClInclude Include="include\Poco\Data\Extraction.h"/> <ClInclude Include="include\Poco\Data\Extraction.h" />
<ClInclude Include="include\Poco\Data\Limit.h"/> <ClInclude Include="include\Poco\Data\Limit.h" />
<ClInclude Include="include\Poco\Data\LOB.h"/> <ClInclude Include="include\Poco\Data\LOB.h" />
<ClInclude Include="include\Poco\Data\LOBStream.h"/> <ClInclude Include="include\Poco\Data\LOBStream.h" />
<ClInclude Include="include\Poco\Data\MetaColumn.h"/> <ClInclude Include="include\Poco\Data\MetaColumn.h" />
<ClInclude Include="include\Poco\Data\Position.h"/> <ClInclude Include="include\Poco\Data\Position.h" />
<ClInclude Include="include\Poco\data\Preparation.h"/> <ClInclude Include="include\Poco\data\Preparation.h" />
<ClInclude Include="include\Poco\Data\Range.h"/> <ClInclude Include="include\Poco\Data\Range.h" />
<ClInclude Include="include\Poco\Data\RecordSet.h"/> <ClInclude Include="include\Poco\Data\RecordSet.h" />
<ClInclude Include="include\Poco\Data\Row.h"/> <ClInclude Include="include\Poco\Data\Row.h" />
<ClInclude Include="include\Poco\Data\RowFilter.h"/> <ClInclude Include="include\Poco\Data\RowFilter.h" />
<ClInclude Include="include\Poco\Data\RowFormatter.h"/> <ClInclude Include="include\Poco\Data\RowFormatter.h" />
<ClInclude Include="include\Poco\Data\RowIterator.h"/> <ClInclude Include="include\Poco\Data\RowIterator.h" />
<ClInclude Include="include\Poco\Data\Session.h"/> <ClInclude Include="include\Poco\Data\Session.h" />
<ClInclude Include="include\Poco\Data\SessionFactory.h"/> <ClInclude Include="include\Poco\Data\SessionFactory.h" />
<ClInclude Include="include\Poco\Data\SessionImpl.h"/> <ClInclude Include="include\Poco\Data\SessionImpl.h" />
<ClInclude Include="include\Poco\Data\SimpleRowFormatter.h"/> <ClInclude Include="include\Poco\Data\SimpleRowFormatter.h" />
<ClInclude Include="include\Poco\Data\Statement.h"/> <ClInclude Include="include\Poco\Data\Statement.h" />
<ClInclude Include="include\Poco\Data\StatementCreator.h"/> <ClInclude Include="include\Poco\Data\StatementCreator.h" />
<ClInclude Include="include\Poco\Data\StatementImpl.h"/> <ClInclude Include="include\Poco\Data\StatementImpl.h" />
<ClInclude Include="include\Poco\Data\Time.h"/> <ClInclude Include="include\Poco\Data\Time.h" />
<ClInclude Include="include\Poco\Data\Transaction.h"/> <ClInclude Include="include\Poco\Data\Transaction.h" />
<ClInclude Include="include\Poco\Data\TypeHandler.h"/> <ClInclude Include="include\Poco\Data\TypeHandler.h" />
<ClInclude Include="include\Poco\Data\PooledSessionHolder.h"/> <ClInclude Include="include\Poco\Data\PooledSessionHolder.h" />
<ClInclude Include="include\Poco\Data\PooledSessionImpl.h"/> <ClInclude Include="include\Poco\Data\PooledSessionImpl.h" />
<ClInclude Include="include\Poco\Data\SessionPool.h"/> <ClInclude Include="include\Poco\Data\SessionPool.h" />
<ClInclude Include="include\Poco\Data\SessionPoolContainer.h"/> <ClInclude Include="include\Poco\Data\SessionPoolContainer.h" />
<ClInclude Include="include\Poco\Data\ArchiveStrategy.h"/> <ClInclude Include="include\Poco\Data\ArchiveStrategy.h" />
<ClInclude Include="include\Poco\Data\SQLChannel.h"/> <ClInclude Include="include\Poco\Data\SQLChannel.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\AbstractBinder.cpp"/> <ClCompile Include="src\AbstractBinder.cpp" />
<ClCompile Include="src\AbstractBinding.cpp"/> <ClCompile Include="src\AbstractBinding.cpp" />
<ClCompile Include="src\AbstractExtraction.cpp"/> <ClCompile Include="src\AbstractExtraction.cpp" />
<ClCompile Include="src\AbstractExtractor.cpp"/> <ClCompile Include="src\AbstractExtractor.cpp" />
<ClCompile Include="src\AbstractPreparation.cpp"/> <ClCompile Include="src\AbstractPreparation.cpp" />
<ClCompile Include="src\AbstractPreparator.cpp"/> <ClCompile Include="src\AbstractPreparator.cpp" />
<ClCompile Include="src\Bulk.cpp"/> <ClCompile Include="src\Bulk.cpp" />
<ClCompile Include="src\Connector.cpp"/> <ClCompile Include="src\Connector.cpp" />
<ClCompile Include="src\DataException.cpp"/> <ClCompile Include="src\DataException.cpp" />
<ClCompile Include="src\Date.cpp"/> <ClCompile Include="src\Date.cpp" />
<ClCompile Include="src\DynamicLOB.cpp"/> <ClCompile Include="src\DynamicLOB.cpp" />
<ClCompile Include="src\Limit.cpp"/> <ClCompile Include="src\Limit.cpp" />
<ClCompile Include="src\MetaColumn.cpp"/> <ClCompile Include="src\MetaColumn.cpp" />
<ClCompile Include="src\Position.cpp"/> <ClCompile Include="src\Position.cpp" />
<ClCompile Include="src\Range.cpp"/> <ClCompile Include="src\Range.cpp" />
<ClCompile Include="src\RecordSet.cpp"/> <ClCompile Include="src\RecordSet.cpp" />
<ClCompile Include="src\Row.cpp"/> <ClCompile Include="src\Row.cpp" />
<ClCompile Include="src\RowFilter.cpp"/> <ClCompile Include="src\RowFilter.cpp" />
<ClCompile Include="src\RowFormatter.cpp"/> <ClCompile Include="src\RowFormatter.cpp" />
<ClCompile Include="src\RowIterator.cpp"/> <ClCompile Include="src\RowIterator.cpp" />
<ClCompile Include="src\Session.cpp"/> <ClCompile Include="src\Session.cpp" />
<ClCompile Include="src\SessionFactory.cpp"/> <ClCompile Include="src\SessionFactory.cpp" />
<ClCompile Include="src\SessionImpl.cpp"/> <ClCompile Include="src\SessionImpl.cpp">
<ClCompile Include="src\SimpleRowFormatter.cpp"/> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
<ClCompile Include="src\Statement.cpp"/> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
<ClCompile Include="src\StatementCreator.cpp"/> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
<ClCompile Include="src\StatementImpl.cpp"/> </ClCompile>
<ClCompile Include="src\Time.cpp"/> <ClCompile Include="src\SimpleRowFormatter.cpp" />
<ClCompile Include="src\Transaction.cpp"/> <ClCompile Include="src\Statement.cpp" />
<ClCompile Include="src\PooledSessionHolder.cpp"/> <ClCompile Include="src\StatementCreator.cpp" />
<ClCompile Include="src\PooledSessionImpl.cpp"/> <ClCompile Include="src\StatementImpl.cpp">
<ClCompile Include="src\SessionPool.cpp"/> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
<ClCompile Include="src\SessionPoolContainer.cpp"/> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
<ClCompile Include="src\ArchiveStrategy.cpp"/> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
<ClCompile Include="src\SQLChannel.cpp"/> </ClCompile>
<ClCompile Include="src\Time.cpp" />
<ClCompile Include="src\Transaction.cpp" />
<ClCompile Include="src\PooledSessionHolder.cpp" />
<ClCompile Include="src\PooledSessionImpl.cpp" />
<ClCompile Include="src\SessionPool.cpp" />
<ClCompile Include="src\SessionPoolContainer.cpp" />
<ClCompile Include="src\ArchiveStrategy.cpp" />
<ClCompile Include="src\SQLChannel.cpp" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"/> <ImportGroup Label="ExtensionTargets" />
</Project> </Project>

2
Data/include/Poco/Data/RowIterator.h
View File

@@ -64,7 +64,7 @@ public:
typedef Row* pointer; typedef Row* pointer;
typedef Row& reference; typedef Row& reference;
static const int POSITION_END; static const std::size_t POSITION_END;
/// End position indicator. /// End position indicator.
RowIterator(RecordSet* pRecordSet, bool positionEnd); RowIterator(RecordSet* pRecordSet, bool positionEnd);

2
Data/include/Poco/Data/StatementImpl.h
View File

@@ -350,7 +350,7 @@ private:
return new InternalBulkExtraction<C>(*pData, return new InternalBulkExtraction<C>(*pData,
pCol, pCol,
static_cast<Poco::UInt32>(getExtractionLimit()), static_cast<Poco::UInt32>(getExtractionLimit()),
Position(currentDataSet())); Position(static_cast<Poco::UInt32>(currentDataSet())));
} }
template <class T> template <class T>

2
Data/src/RowIterator.cpp
View File

@@ -45,7 +45,7 @@ namespace Poco {
namespace Data { 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): RowIterator::RowIterator(RecordSet* pRecordSet, bool positionEnd):

2
Foundation/include/Poco/RecursiveDirectoryIteratorImpl.h
View File

@@ -116,7 +116,7 @@ private:
/// Function which implements the logic of determining /// Function which implements the logic of determining
/// recursion depth. /// recursion depth.
{ {
return stack.size(); return static_cast<Poco::UInt16>(stack.size());
} }
UInt16 _maxDepth; UInt16 _maxDepth;

19
buildwin.cmd
View File

@@ -49,14 +49,21 @@ set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH%
rem VS_VERSION {71 | 80 | 90 | 100 | 110} rem VS_VERSION {71 | 80 | 90 | 100 | 110}
if "%1"=="" goto usage if "%1"=="" goto usage
set VS_VERSION=vs%1 set VS_VERSION=vs%1
set VS_64_BIT_ENV=VC\bin\x86_amd64\vcvarsx86_amd64.bat
if not defined VCINSTALLDIR ( if not defined VCINSTALLDIR (
if %1==71 (call "%VS71COMNTOOLS%vsvars32.bat") else ( if %VS_VERSION%==vs71 (call "%VS71COMNTOOLS%vsvars32.bat") else (
if %1==80 (call "%VS80COMNTOOLS%vsvars32.bat") else ( if %VS_VERSION%==vs80 (call "%VS80COMNTOOLS%vsvars32.bat") else (
if %1==90 (call "%VS90COMNTOOLS%vsvars32.bat") else ( if %VS_VERSION%==vs90 (
if %1==100 (call "%VS100COMNTOOLS%vsvars32.bat") else ( if %5==x64 (call "%VS90COMNTOOLS%..\..\%VS_64_BIT_ENV%") else (
if %1==110 (call "%VS110COMNTOOLS%vsvars32.bat") 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 ( if not defined VSINSTALLDIR (
echo Error: No Visual C++ environment found. echo Error: No Visual C++ environment found.