4368 oracle odbc tests (#4410)

* feat(format): Add string_view format type spec #4409

* chore(Types): add demangle

* fix(Data): Oracle failing ODBC tests #4368

* fix some CQL and fuzz warnings; add Var::typeName()

* fix(build): -std=c++17 and c11

* fix windows build

* fix(Foundation): test apps vs projects c++17

* chore(build): remove uneeded compiler flag

* fix(VarHolder): number of digits range check for int->float conversion (reported by CIFuzz)

* fix(test): CIFuzz

* fix(CIFuzz): another attempt

* fix(progen): add LanguageStandard (stdcpp17, stdc11); regenerate vs170 projects

* fix(CiFuzz): add int->float precision loss barrier; fix erroneous number of digits logic

* enh(Var): silent loss of precision on int->float conversion #4423

* enh(Var): silent loss of precision on int->float conversion #4423

* chore(build): remove old build files

* chore: fix missing parens warning

* enh(Thread_POSIX): prevent double-joining; add error description to exceptions

* fix(Data): unresolved Column<long> linkage in test

* fix(demangle): determine type name from template parameter; add eror diagnostic for demangling failures

* chore(buildwin): remove old vs versions from build and progen scripts; update documentation

* chore(buildwin): remove leftover closing curly
This commit is contained in:
Aleksandar Fabijanic 2024-01-31 22:07:07 +01:00 committed by GitHub
parent bf2f96847a
commit c7d16b2a7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
243 changed files with 7158 additions and 1434 deletions

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoActiveRecordA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoActiveRecordA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoActiveRecordmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoActiveRecordmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoActiveRecordmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoActiveRecordmtd</TargetName>
@ -346,6 +346,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoActiveRecordA64d.dll</OutputFile> <OutputFile>..\binA64\PocoActiveRecordA64d.dll</OutputFile>
@ -379,6 +381,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoActiveRecordA64.dll</OutputFile> <OutputFile>..\binA64\PocoActiveRecordA64.dll</OutputFile>
@ -410,6 +414,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoActiveRecordmtd.lib</OutputFile> <OutputFile>..\libA64\PocoActiveRecordmtd.lib</OutputFile>
@ -436,6 +442,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoActiveRecordmt.lib</OutputFile> <OutputFile>..\libA64\PocoActiveRecordmt.lib</OutputFile>
@ -459,6 +467,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoActiveRecordmdd.lib</OutputFile> <OutputFile>..\libA64\PocoActiveRecordmdd.lib</OutputFile>
@ -485,6 +495,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoActiveRecordmd.lib</OutputFile> <OutputFile>..\libA64\PocoActiveRecordmd.lib</OutputFile>
@ -508,6 +520,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoActiveRecordd.dll</OutputFile> <OutputFile>..\bin\PocoActiveRecordd.dll</OutputFile>
@ -541,6 +555,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoActiveRecord.dll</OutputFile> <OutputFile>..\bin\PocoActiveRecord.dll</OutputFile>
@ -572,6 +588,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoActiveRecordmtd.lib</OutputFile> <OutputFile>..\lib\PocoActiveRecordmtd.lib</OutputFile>
@ -598,6 +616,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoActiveRecordmt.lib</OutputFile> <OutputFile>..\lib\PocoActiveRecordmt.lib</OutputFile>
@ -621,6 +641,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoActiveRecordmdd.lib</OutputFile> <OutputFile>..\lib\PocoActiveRecordmdd.lib</OutputFile>
@ -647,6 +669,8 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoActiveRecordmd.lib</OutputFile> <OutputFile>..\lib\PocoActiveRecordmd.lib</OutputFile>
@ -670,6 +694,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoActiveRecord64d.dll</OutputFile> <OutputFile>..\bin64\PocoActiveRecord64d.dll</OutputFile>
@ -703,6 +729,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoActiveRecord64.dll</OutputFile> <OutputFile>..\bin64\PocoActiveRecord64.dll</OutputFile>
@ -734,6 +762,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoActiveRecordmtd.lib</OutputFile> <OutputFile>..\lib64\PocoActiveRecordmtd.lib</OutputFile>
@ -760,6 +790,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoActiveRecordmt.lib</OutputFile> <OutputFile>..\lib64\PocoActiveRecordmt.lib</OutputFile>
@ -783,6 +815,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoActiveRecordmdd.lib</OutputFile> <OutputFile>..\lib64\PocoActiveRecordmdd.lib</OutputFile>
@ -809,6 +843,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoActiveRecordmd.lib</OutputFile> <OutputFile>..\lib64\PocoActiveRecordmd.lib</OutputFile>
@ -825,15 +861,23 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\ActiveRecord.cpp"> <ClCompile Include="src\ActiveRecord.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Context.cpp"> <ClCompile Include="src\Context.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\IDTraits.cpp"> <ClCompile Include="src\IDTraits.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\StatementPlaceholderProvider.cpp"> <ClCompile Include="src\StatementPlaceholderProvider.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,13 +2,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="ActiveRecord"> <Filter Include="ActiveRecord">
<UniqueIdentifier>{73c14701-9a05-4ff0-ad45-6a014639a69e}</UniqueIdentifier> <UniqueIdentifier>{2abfaee0-49a0-4b66-9ad7-04a203cfc8cb}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ActiveRecord\Header Files"> <Filter Include="ActiveRecord\Header Files">
<UniqueIdentifier>{163f196a-9202-45e4-80aa-20307db240a7}</UniqueIdentifier> <UniqueIdentifier>{70b1a521-93e8-4228-ae59-baa5f0e57675}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ActiveRecord\Source Files"> <Filter Include="ActiveRecord\Source Files">
<UniqueIdentifier>{15a3b1af-8e8c-4aff-bb0f-04c75fcc1610}</UniqueIdentifier> <UniqueIdentifier>{6b444098-e516-439f-aaf8-266510aa8702}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|ARM64"> <ProjectConfiguration Include="debug_shared|ARM64">
<Configuration>debug_shared</Configuration> <Configuration>debug_shared</Configuration>
@ -75,6 +75,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
<ProjectName>Compiler</ProjectName> <ProjectName>Compiler</ProjectName>
<ProjectGuid>{84DD1CB5-4735-478A-B48E-5E4858F0E831}</ProjectGuid> <ProjectGuid>{84DD1CB5-4735-478A-B48E-5E4858F0E831}</ProjectGuid>
<RootNamespace>Compiler</RootNamespace> <RootNamespace>Compiler</RootNamespace>
@ -229,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>16.0.33423.256</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">poco-arcd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">poco-arcd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">poco-arcd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">poco-arcd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">poco-arcd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">poco-arcd</TargetName>
@ -355,14 +356,17 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>binA64\poco-arcd.exe</OutputFile> <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>binA64\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineARM64</TargetMachine> <TargetMachine>MachineARM64</TargetMachine>
</Link> </Link>
@ -386,7 +390,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>binA64\poco-arc.exe</OutputFile> <OutputFile>binA64\poco-arc.exe</OutputFile>
@ -414,7 +421,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -422,7 +432,7 @@
<AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>binA64\static_mt\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineARM64</TargetMachine> <TargetMachine>MachineARM64</TargetMachine>
</Link> </Link>
@ -446,7 +456,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -475,7 +488,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -483,7 +499,7 @@
<AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>binA64\static_md\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineARM64</TargetMachine> <TargetMachine>MachineARM64</TargetMachine>
</Link> </Link>
@ -507,11 +523,14 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>binA64\static_md\poco-arc.exe</OutputFile> <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -536,14 +555,17 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>bin\poco-arcd.exe</OutputFile> <OutputFile>bin\poco-arcd.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
@ -567,7 +589,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>bin\poco-arc.exe</OutputFile> <OutputFile>bin\poco-arc.exe</OutputFile>
@ -595,7 +620,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -603,7 +631,7 @@
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin\static_mt\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
@ -627,7 +655,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -656,7 +687,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -664,7 +698,7 @@
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin\static_md\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
@ -688,7 +722,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -717,14 +754,17 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>bin64\poco-arcd.exe</OutputFile> <OutputFile>bin64\poco-arcd.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin64\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
@ -748,7 +788,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>bin64\poco-arc.exe</OutputFile> <OutputFile>bin64\poco-arc.exe</OutputFile>
@ -776,7 +819,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -784,7 +830,7 @@
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin64\static_mt\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
@ -808,7 +854,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -837,7 +886,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -845,7 +897,7 @@
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>bin64\static_md\poco-arcd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
@ -869,7 +921,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -885,18 +940,28 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\CodeGenerator.cpp"> <ClCompile Include="src\CodeGenerator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Compiler.cpp"> <ClCompile Include="src\Compiler.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\HeaderGenerator.cpp"> <ClCompile Include="src\HeaderGenerator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ImplGenerator.cpp"> <ClCompile Include="src\ImplGenerator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Parser.cpp"> <ClCompile Include="src\Parser.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{8696c7e6-f237-4b80-85b6-deff68bb7313}</UniqueIdentifier> <UniqueIdentifier>{7f2913e1-102b-4ce6-a4b2-f99c8e3a38cd}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{809f78f0-73d1-44df-992c-7aa5a1b3392b}</UniqueIdentifier> <UniqueIdentifier>{9edf2033-52b6-4c16-a062-2b35e3cefb3c}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,18 +946,28 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\ActiveRecordTest.cpp"> <ClCompile Include="src\ActiveRecordTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ActiveRecordTestSuite.cpp"> <ClCompile Include="src\ActiveRecordTestSuite.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Driver.cpp"> <ClCompile Include="src\Driver.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Employee.cpp"> <ClCompile Include="src\Employee.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Role.cpp"> <ClCompile Include="src\Role.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,16 +2,16 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{441842f8-5906-4eba-8622-ce2adb220b2c}</UniqueIdentifier> <UniqueIdentifier>{40b247c9-e15e-4d60-abc1-cf9c1cb2f66e}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{d9408da8-d459-41c9-a781-65c0f5434c36}</UniqueIdentifier> <UniqueIdentifier>{1a029e91-d286-42b9-8a58-c4a09641a8ae}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Generated Header Files"> <Filter Include="Generated Header Files">
<UniqueIdentifier>{b89d1d90-8f75-4b8e-a5f5-70f76b1f6831}</UniqueIdentifier> <UniqueIdentifier>{73651c18-d9ec-4a46-b4d9-3f28ae384bb3}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Generated Source Files"> <Filter Include="Generated Source Files">
<UniqueIdentifier>{7f27626c-1bc5-4720-8115-2e140a2110f3}</UniqueIdentifier> <UniqueIdentifier>{8382d412-0a64-4d8c-ad1e-befe17f70b65}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoCppParserA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoCppParserA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoCppParsermdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoCppParsermdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoCppParsermtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoCppParsermtd</TargetName>
@ -344,13 +344,16 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoCppParserA64d.dll</OutputFile> <OutputFile>..\binA64\PocoCppParserA64d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\binA64\PocoCppParserA64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\libA64\PocoCppParserd.lib</ImportLibrary> <ImportLibrary>..\libA64\PocoCppParserd.lib</ImportLibrary>
@ -376,7 +379,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoCppParserA64.dll</OutputFile> <OutputFile>..\binA64\PocoCppParserA64.dll</OutputFile>
@ -403,11 +409,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\libA64\PocoCppParsermtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCppParsermtd.lib</OutputFile> <OutputFile>..\libA64\PocoCppParsermtd.lib</OutputFile>
@ -432,7 +440,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCppParsermt.lib</OutputFile> <OutputFile>..\libA64\PocoCppParsermt.lib</OutputFile>
@ -451,11 +462,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\libA64\PocoCppParsermdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCppParsermdd.lib</OutputFile> <OutputFile>..\libA64\PocoCppParsermdd.lib</OutputFile>
@ -480,7 +493,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCppParsermd.lib</OutputFile> <OutputFile>..\libA64\PocoCppParsermd.lib</OutputFile>
@ -502,13 +518,16 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoCppParserd.dll</OutputFile> <OutputFile>..\bin\PocoCppParserd.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\PocoCppParserd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\lib\PocoCppParserd.lib</ImportLibrary> <ImportLibrary>..\lib\PocoCppParserd.lib</ImportLibrary>
@ -534,7 +553,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoCppParser.dll</OutputFile> <OutputFile>..\bin\PocoCppParser.dll</OutputFile>
@ -561,11 +583,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoCppParsermtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile> <OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile>
@ -590,7 +614,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppParsermt.lib</OutputFile> <OutputFile>..\lib\PocoCppParsermt.lib</OutputFile>
@ -609,11 +636,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile> <OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile>
@ -635,11 +664,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoCppParsermd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppParsermd.lib</OutputFile> <OutputFile>..\lib\PocoCppParsermd.lib</OutputFile>
@ -661,13 +692,16 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoCppParser64d.dll</OutputFile> <OutputFile>..\bin64\PocoCppParser64d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\PocoCppParser64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\lib64\PocoCppParserd.lib</ImportLibrary> <ImportLibrary>..\lib64\PocoCppParserd.lib</ImportLibrary>
@ -693,7 +727,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoCppParser64.dll</OutputFile> <OutputFile>..\bin64\PocoCppParser64.dll</OutputFile>
@ -720,11 +757,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoCppParsermtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile> <OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile>
@ -749,7 +788,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile> <OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile>
@ -768,11 +810,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile> <OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile>
@ -797,7 +841,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile> <OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile>
@ -826,54 +873,88 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Attributes.cpp"> <ClCompile Include="src\Attributes.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\AttributesParser.cpp"> <ClCompile Include="src\AttributesParser.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\BuiltIn.cpp"> <ClCompile Include="src\BuiltIn.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CppToken.cpp"> <ClCompile Include="src\CppToken.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Decl.cpp"> <ClCompile Include="src\Decl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Enum.cpp"> <ClCompile Include="src\Enum.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\EnumValue.cpp"> <ClCompile Include="src\EnumValue.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Function.cpp"> <ClCompile Include="src\Function.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\NameSpace.cpp"> <ClCompile Include="src\NameSpace.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Parameter.cpp"> <ClCompile Include="src\Parameter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Parser.cpp"> <ClCompile Include="src\Parser.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Struct.cpp"> <ClCompile Include="src\Struct.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Symbol.cpp"> <ClCompile Include="src\Symbol.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Tokenizer.cpp"> <ClCompile Include="src\Tokenizer.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TypeDef.cpp"> <ClCompile Include="src\TypeDef.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Utility.cpp"> <ClCompile Include="src\Utility.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Variable.cpp"> <ClCompile Include="src\Variable.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="CppParser"> <Filter Include="CppParser">
<UniqueIdentifier>{803680d7-8697-4833-ac76-c0b035a48327}</UniqueIdentifier> <UniqueIdentifier>{22a4c008-4a23-452a-a12a-0f6595ae1200}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="CppParser\Header Files"> <Filter Include="CppParser\Header Files">
<UniqueIdentifier>{6a32a7ae-3ba1-4d1b-a430-369514733719}</UniqueIdentifier> <UniqueIdentifier>{2e3628cf-e59b-487e-97d3-46b28b5da8bb}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="CppParser\Source Files"> <Filter Include="CppParser\Source Files">
<UniqueIdentifier>{d26b3bc1-6ae7-43a8-b70a-7b92124b85ba}</UniqueIdentifier> <UniqueIdentifier>{0ecc68a2-22c2-49af-a1fa-5a79c770e52c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Symbol Table"> <Filter Include="Symbol Table">
<UniqueIdentifier>{d733f192-ef00-4438-9249-ed2f61cda759}</UniqueIdentifier> <UniqueIdentifier>{975cd316-19e5-4786-aef8-112ead31879b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Symbol Table\Header Files"> <Filter Include="Symbol Table\Header Files">
<UniqueIdentifier>{835f5859-0043-4810-b49f-569906e74133}</UniqueIdentifier> <UniqueIdentifier>{7f74c210-2a9e-45b7-9fb1-748934d57b22}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Symbol Table\Source Files"> <Filter Include="Symbol Table\Source Files">
<UniqueIdentifier>{d2110c01-94b4-49f3-af2c-e902c90a3b01}</UniqueIdentifier> <UniqueIdentifier>{f605c7cb-1238-4ceb-a104-d0d0e63dd7b3}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Attributes"> <Filter Include="Attributes">
<UniqueIdentifier>{f2afc2af-bcb9-4800-8ec3-7c4cdd55f76c}</UniqueIdentifier> <UniqueIdentifier>{315aef06-cd6e-4d01-8d73-5e1dbff488fd}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Attributes\Header Files"> <Filter Include="Attributes\Header Files">
<UniqueIdentifier>{ceac8a5a-7b87-4cad-8be7-1578e4516e01}</UniqueIdentifier> <UniqueIdentifier>{f5c52f93-e8ca-4de7-b0ce-c7fb7a0ad50f}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Attributes\Source Files"> <Filter Include="Attributes\Source Files">
<UniqueIdentifier>{b152b378-58a8-4c41-8bcf-f6d1a1a247b9}</UniqueIdentifier> <UniqueIdentifier>{2bf7e8a4-f378-436f-b321-4b7ec8b9fe1d}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">CppUnitA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">CppUnitA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">CppUnitmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">CppUnitmtd</TargetName>
@ -346,6 +346,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\CppUnitA64d.dll</OutputFile> <OutputFile>..\binA64\CppUnitA64d.dll</OutputFile>
@ -379,6 +381,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\CppUnitA64.dll</OutputFile> <OutputFile>..\binA64\CppUnitA64.dll</OutputFile>
@ -410,6 +414,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\CppUnitmtd.lib</OutputFile> <OutputFile>..\libA64\CppUnitmtd.lib</OutputFile>
@ -436,6 +442,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\CppUnitmt.lib</OutputFile> <OutputFile>..\libA64\CppUnitmt.lib</OutputFile>
@ -459,6 +467,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\CppUnitmdd.lib</OutputFile> <OutputFile>..\libA64\CppUnitmdd.lib</OutputFile>
@ -485,6 +495,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\CppUnitmd.lib</OutputFile> <OutputFile>..\libA64\CppUnitmd.lib</OutputFile>
@ -508,6 +520,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\CppUnitd.dll</OutputFile> <OutputFile>..\bin\CppUnitd.dll</OutputFile>
@ -541,6 +555,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\CppUnit.dll</OutputFile> <OutputFile>..\bin\CppUnit.dll</OutputFile>
@ -572,6 +588,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\CppUnitmtd.lib</OutputFile>
@ -598,6 +616,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\CppUnitmt.lib</OutputFile>
@ -621,6 +641,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\CppUnitmdd.lib</OutputFile>
@ -647,6 +669,8 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\CppUnitmd.lib</OutputFile>
@ -670,6 +694,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\CppUnit64d.dll</OutputFile> <OutputFile>..\bin64\CppUnit64d.dll</OutputFile>
@ -703,6 +729,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\CppUnit64.dll</OutputFile> <OutputFile>..\bin64\CppUnit64.dll</OutputFile>
@ -734,6 +762,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib64\CppUnitmtd.lib</OutputFile>
@ -760,6 +790,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmt.lib</OutputFile> <OutputFile>..\lib64\CppUnitmt.lib</OutputFile>
@ -783,6 +815,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib64\CppUnitmdd.lib</OutputFile>
@ -809,6 +843,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmd.lib</OutputFile> <OutputFile>..\lib64\CppUnitmd.lib</OutputFile>
@ -817,27 +853,43 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\CppUnitException.cpp"> <ClCompile Include="src\CppUnitException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestCase.cpp"> <ClCompile Include="src\TestCase.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestDecorator.cpp"> <ClCompile Include="src\TestDecorator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestFailure.cpp"> <ClCompile Include="src\TestFailure.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestResult.cpp"> <ClCompile Include="src\TestResult.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestRunner.cpp"> <ClCompile Include="src\TestRunner.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestSuite.cpp"> <ClCompile Include="src\TestSuite.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TextTestResult.cpp"> <ClCompile Include="src\TextTestResult.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,11 +2,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{84e2f454-350e-4e2b-8bfd-f3cbbb62f23c}</UniqueIdentifier> <UniqueIdentifier>{c81826ae-391d-40d2-ad57-7d8ed59ba862}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter> </Filter>
<Filter Include="Include Files"> <Filter Include="Include Files">
<UniqueIdentifier>{e32858e2-8161-4416-aa5b-e230b409f24b}</UniqueIdentifier> <UniqueIdentifier>{6baa3333-3a56-45c4-a3a4-6774d2121132}</UniqueIdentifier>
<Extensions>*.h</Extensions> <Extensions>*.h</Extensions>
</Filter> </Filter>
</ItemGroup> </ItemGroup>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|ARM64"> <ProjectConfiguration Include="debug_shared|ARM64">
<Configuration>debug_shared</Configuration> <Configuration>debug_shared</Configuration>
@ -75,6 +75,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
<ProjectName>Crypto</ProjectName> <ProjectName>Crypto</ProjectName>
<ProjectGuid>{EEEE7259-32E9-4D56-B023-C733940AB2A0}</ProjectGuid> <ProjectGuid>{EEEE7259-32E9-4D56-B023-C733940AB2A0}</ProjectGuid>
<RootNamespace>Crypto</RootNamespace> <RootNamespace>Crypto</RootNamespace>
@ -229,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>16.0.32629.160</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoCryptoA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoCryptoA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoCryptomdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoCryptomdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoCryptomtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoCryptomtd</TargetName>
@ -343,14 +344,17 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\binA64\PocoCryptoA64d.dll</OutputFile> <OutputFile>..\binA64\PocoCryptoA64d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\binA64\PocoCryptoA64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\libA64\PocoCryptod.lib</ImportLibrary> <ImportLibrary>..\libA64\PocoCryptod.lib</ImportLibrary>
@ -376,7 +380,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -404,11 +411,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\libA64\PocoCryptomtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCryptomtd.lib</OutputFile> <OutputFile>..\libA64\PocoCryptomtd.lib</OutputFile>
@ -433,7 +442,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCryptomt.lib</OutputFile> <OutputFile>..\libA64\PocoCryptomt.lib</OutputFile>
@ -452,11 +464,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\libA64\PocoCryptomdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCryptomdd.lib</OutputFile> <OutputFile>..\libA64\PocoCryptomdd.lib</OutputFile>
@ -481,7 +495,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoCryptomd.lib</OutputFile> <OutputFile>..\libA64\PocoCryptomd.lib</OutputFile>
@ -503,14 +520,17 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\bin\PocoCryptod.dll</OutputFile> <OutputFile>..\bin\PocoCryptod.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\PocoCryptod.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\lib\PocoCryptod.lib</ImportLibrary> <ImportLibrary>..\lib\PocoCryptod.lib</ImportLibrary>
@ -536,7 +556,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -564,11 +587,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoCryptomtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCryptomtd.lib</OutputFile> <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
@ -593,7 +618,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCryptomt.lib</OutputFile> <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
@ -612,11 +640,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCryptomdd.lib</OutputFile> <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
@ -638,11 +668,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoCryptomd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -665,14 +697,17 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\bin64\PocoCrypto64d.dll</OutputFile> <OutputFile>..\bin64\PocoCrypto64d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\PocoCrypto64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\lib64\PocoCryptod.lib</ImportLibrary> <ImportLibrary>..\lib64\PocoCryptod.lib</ImportLibrary>
@ -698,7 +733,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -726,11 +764,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoCryptomtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile> <OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile>
@ -755,7 +795,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCryptomt.lib</OutputFile> <OutputFile>..\lib64\PocoCryptomt.lib</OutputFile>
@ -774,11 +817,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile> <OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile>
@ -803,7 +848,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoCryptomd.lib</OutputFile> <OutputFile>..\lib64\PocoCryptomd.lib</OutputFile>
@ -839,75 +887,123 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Cipher.cpp"> <ClCompile Include="src\Cipher.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CipherFactory.cpp"> <ClCompile Include="src\CipherFactory.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CipherImpl.cpp"> <ClCompile Include="src\CipherImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CipherKey.cpp"> <ClCompile Include="src\CipherKey.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CipherKeyImpl.cpp"> <ClCompile Include="src\CipherKeyImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CryptoException.cpp"> <ClCompile Include="src\CryptoException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CryptoStream.cpp"> <ClCompile Include="src\CryptoStream.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\CryptoTransform.cpp"> <ClCompile Include="src\CryptoTransform.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\DigestEngine.cpp"> <ClCompile Include="src\DigestEngine.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ECDSADigestEngine.cpp"> <ClCompile Include="src\ECDSADigestEngine.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ECKey.cpp"> <ClCompile Include="src\ECKey.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ECKeyImpl.cpp"> <ClCompile Include="src\ECKeyImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Envelope.cpp"> <ClCompile Include="src\Envelope.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\EVPCipherImpl.cpp"> <ClCompile Include="src\EVPCipherImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\EVPPKey.cpp"> <ClCompile Include="src\EVPPKey.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\KeyPair.cpp"> <ClCompile Include="src\KeyPair.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\KeyPairImpl.cpp"> <ClCompile Include="src\KeyPairImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\OpenSSLInitializer.cpp"> <ClCompile Include="src\OpenSSLInitializer.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\PKCS12Container.cpp"> <ClCompile Include="src\PKCS12Container.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RSACipherImpl.cpp"> <ClCompile Include="src\RSACipherImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RSADigestEngine.cpp"> <ClCompile Include="src\RSADigestEngine.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RSAKey.cpp"> <ClCompile Include="src\RSAKey.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RSAKeyImpl.cpp"> <ClCompile Include="src\RSAKeyImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\X509Certificate.cpp"> <ClCompile Include="src\X509Certificate.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,58 +2,58 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Cipher"> <Filter Include="Cipher">
<UniqueIdentifier>{956bb6d7-1946-4d8e-a988-6f840553f433}</UniqueIdentifier> <UniqueIdentifier>{e4c49a27-04d0-4ddc-8795-f17c70e2b7e7}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Cipher\Header Files"> <Filter Include="Cipher\Header Files">
<UniqueIdentifier>{ac7c9562-5031-4fd3-bf00-58ee2afd58f1}</UniqueIdentifier> <UniqueIdentifier>{c152364e-4636-4536-9d1f-ceb02dffa264}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Cipher\Source Files"> <Filter Include="Cipher\Source Files">
<UniqueIdentifier>{bc2c461a-a460-43c5-9dda-e1ac05590b4a}</UniqueIdentifier> <UniqueIdentifier>{9510091e-4f8d-499b-92a6-be553d45316b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="RSA"> <Filter Include="RSA">
<UniqueIdentifier>{6f66dac0-646c-425e-98f9-0443b14bea15}</UniqueIdentifier> <UniqueIdentifier>{fbfd0876-4670-4def-a529-7cf8923c2961}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="RSA\Header Files"> <Filter Include="RSA\Header Files">
<UniqueIdentifier>{3cd7a042-61b8-4430-88a3-96de91011504}</UniqueIdentifier> <UniqueIdentifier>{5b21093d-d3b4-4291-b47f-ece9f024ddd8}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="RSA\Source Files"> <Filter Include="RSA\Source Files">
<UniqueIdentifier>{5480a739-70e8-4989-9388-858bc73745bf}</UniqueIdentifier> <UniqueIdentifier>{d9423ed6-d9b6-4ecb-b6b8-9322d6c3f995}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Certificate"> <Filter Include="Certificate">
<UniqueIdentifier>{10a1798e-fd19-4a4b-a4fa-078316b35b4a}</UniqueIdentifier> <UniqueIdentifier>{129cbfa3-8e47-4cdd-a614-6df3e4fb0408}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Certificate\Header Files"> <Filter Include="Certificate\Header Files">
<UniqueIdentifier>{948b072b-d50b-4e17-bed4-3bae8345be51}</UniqueIdentifier> <UniqueIdentifier>{572de956-2613-47de-9629-80a415067e58}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Certificate\Source Files"> <Filter Include="Certificate\Source Files">
<UniqueIdentifier>{984e69ae-d972-430f-84ad-885ce648930e}</UniqueIdentifier> <UniqueIdentifier>{4b330ecf-7831-4b3f-8e7b-f3b028ba97b0}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="CryptoCore"> <Filter Include="CryptoCore">
<UniqueIdentifier>{c4a637d7-9aad-4d1b-b9ce-b00a3a9bf47c}</UniqueIdentifier> <UniqueIdentifier>{b213e21e-b970-4e41-897f-af8f064c1926}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="CryptoCore\Header Files"> <Filter Include="CryptoCore\Header Files">
<UniqueIdentifier>{ef263eac-80d3-4c1a-abee-af439456b293}</UniqueIdentifier> <UniqueIdentifier>{912e16ae-3f1e-4087-8ada-0b1a7d45f6c4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="CryptoCore\Source Files"> <Filter Include="CryptoCore\Source Files">
<UniqueIdentifier>{2af1dbe7-277e-4ab3-b8ad-255c4cf4f3ac}</UniqueIdentifier> <UniqueIdentifier>{dddf49b9-d285-46ad-9aed-0bd977e67caf}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Digest"> <Filter Include="Digest">
<UniqueIdentifier>{8d350d20-818d-4e10-8a87-6df008441927}</UniqueIdentifier> <UniqueIdentifier>{1eb34481-278c-49c3-a4e8-6e6733e0a06d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Digest\Header Files"> <Filter Include="Digest\Header Files">
<UniqueIdentifier>{a6bd57e4-6d39-4a42-aa3d-4b1ad9e262fa}</UniqueIdentifier> <UniqueIdentifier>{b181d31d-7aa8-4436-9353-a420cca61fbf}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Digest\Source Files"> <Filter Include="Digest\Source Files">
<UniqueIdentifier>{1c3b1b7c-2a2b-4eba-bc22-cedfdcc12b48}</UniqueIdentifier> <UniqueIdentifier>{12de2d74-9477-43ae-b3d8-4a94001b6eb1}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="EC"> <Filter Include="EC">
<UniqueIdentifier>{a692dced-8e66-4531-9567-6b57a3f9d89f}</UniqueIdentifier> <UniqueIdentifier>{c0df7136-ad12-4fdc-bda1-73a46c627a4c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="EC\Header Files"> <Filter Include="EC\Header Files">
<UniqueIdentifier>{d6b09c46-8d74-4ab2-99b0-31923c880bed}</UniqueIdentifier> <UniqueIdentifier>{b6cdd172-33a7-448b-85e5-c9982b77c53e}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="EC\Source Files"> <Filter Include="EC\Source Files">
<UniqueIdentifier>{b0414365-c964-4c45-a80e-8539c5fe0b5b}</UniqueIdentifier> <UniqueIdentifier>{384218a8-372e-47a7-b7f2-2ce7f7be1860}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -16,6 +16,6 @@ vc.project.compiler.defines =
vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_EXPORTS vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_EXPORTS
vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.additionalOptions = /bigobj /std:c++17 /Zc:__cplusplus vc.project.compiler.additionalOptions = /bigobj /Zc:__cplusplus
vc.solution.create = true vc.solution.create = true
vc.solution.include = testsuite\\TestSuite,testsuite\\DataTest\\DataTest vc.solution.include = testsuite\\TestSuite,testsuite\\DataTest\\DataTest

View File

@ -12,6 +12,6 @@ vc.project.compiler.defines =
vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.additionalOptions = /bigobj /std:c++17 /Zc:__cplusplus vc.project.compiler.additionalOptions = /bigobj /Zc:__cplusplus
vc.solution.create = true vc.solution.create = true
vc.solution.include = testsuite\\TestSuite vc.solution.include = testsuite\\TestSuite

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDatamdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDatamdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDatamtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDatamtd</TargetName>
@ -345,8 +345,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoDataA64d.dll</OutputFile> <OutputFile>..\binA64\PocoDataA64d.dll</OutputFile>
@ -379,8 +381,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoDataA64.dll</OutputFile> <OutputFile>..\binA64\PocoDataA64.dll</OutputFile>
@ -411,8 +415,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoDatamtd.lib</OutputFile> <OutputFile>..\libA64\PocoDatamtd.lib</OutputFile>
@ -438,8 +444,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoDatamt.lib</OutputFile> <OutputFile>..\libA64\PocoDatamt.lib</OutputFile>
@ -462,8 +470,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoDatamdd.lib</OutputFile> <OutputFile>..\libA64\PocoDatamdd.lib</OutputFile>
@ -489,8 +499,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoDatamd.lib</OutputFile> <OutputFile>..\libA64\PocoDatamd.lib</OutputFile>
@ -513,8 +525,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoDatad.dll</OutputFile> <OutputFile>..\bin\PocoDatad.dll</OutputFile>
@ -547,8 +561,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoData.dll</OutputFile> <OutputFile>..\bin\PocoData.dll</OutputFile>
@ -579,8 +595,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoDatamtd.lib</OutputFile> <OutputFile>..\lib\PocoDatamtd.lib</OutputFile>
@ -606,8 +624,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoDatamt.lib</OutputFile> <OutputFile>..\lib\PocoDatamt.lib</OutputFile>
@ -630,8 +650,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoDatamdd.lib</OutputFile> <OutputFile>..\lib\PocoDatamdd.lib</OutputFile>
@ -657,8 +679,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoDatamd.lib</OutputFile> <OutputFile>..\lib\PocoDatamd.lib</OutputFile>
@ -681,8 +705,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoData64d.dll</OutputFile> <OutputFile>..\bin64\PocoData64d.dll</OutputFile>
@ -715,8 +741,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoData64.dll</OutputFile> <OutputFile>..\bin64\PocoData64.dll</OutputFile>
@ -747,8 +775,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoDatamtd.lib</OutputFile> <OutputFile>..\lib64\PocoDatamtd.lib</OutputFile>
@ -774,8 +804,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoDatamt.lib</OutputFile> <OutputFile>..\lib64\PocoDatamt.lib</OutputFile>
@ -798,8 +830,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoDatamdd.lib</OutputFile> <OutputFile>..\lib64\PocoDatamdd.lib</OutputFile>
@ -825,8 +859,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoDatamd.lib</OutputFile> <OutputFile>..\lib64\PocoDatamd.lib</OutputFile>
@ -914,144 +950,238 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\AbstractBinder.cpp"> <ClCompile Include="src\AbstractBinder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\AbstractBinding.cpp"> <ClCompile Include="src\AbstractBinding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\AbstractExtraction.cpp"> <ClCompile Include="src\AbstractExtraction.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\AbstractExtractor.cpp"> <ClCompile Include="src\AbstractExtractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\AbstractPreparation.cpp"> <ClCompile Include="src\AbstractPreparation.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\AbstractPreparator.cpp"> <ClCompile Include="src\AbstractPreparator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ArchiveStrategy.cpp"> <ClCompile Include="src\ArchiveStrategy.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Bulk.cpp"> <ClCompile Include="src\Bulk.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Connector.cpp"> <ClCompile Include="src\Connector.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\DataException.cpp"> <ClCompile Include="src\DataException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Date.cpp"> <ClCompile Include="src\Date.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\DynamicLOB.cpp"> <ClCompile Include="src\DynamicLOB.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp"> <ClCompile Include="src\JSONRowFormatter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Limit.cpp"> <ClCompile Include="src\Limit.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MetaColumn.cpp"> <ClCompile Include="src\MetaColumn.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\PooledSessionHolder.cpp"> <ClCompile Include="src\PooledSessionHolder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\PooledSessionImpl.cpp"> <ClCompile Include="src\PooledSessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Position.cpp"> <ClCompile Include="src\Position.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Range.cpp"> <ClCompile Include="src\Range.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RecordSet.cpp"> <ClCompile Include="src\RecordSet.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Row.cpp"> <ClCompile Include="src\Row.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RowFilter.cpp"> <ClCompile Include="src\RowFilter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RowFormatter.cpp"> <ClCompile Include="src\RowFormatter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\RowIterator.cpp"> <ClCompile Include="src\RowIterator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Session.cpp"> <ClCompile Include="src\Session.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionFactory.cpp"> <ClCompile Include="src\SessionFactory.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionImpl.cpp"> <ClCompile Include="src\SessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionPool.cpp"> <ClCompile Include="src\SessionPool.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionPoolContainer.cpp"> <ClCompile Include="src\SessionPoolContainer.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SimpleRowFormatter.cpp"> <ClCompile Include="src\SimpleRowFormatter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\parser\bison_parser.cpp"> <ClCompile Include="src\sql-parser\src\parser\bison_parser.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\parser\flex_lexer.cpp"> <ClCompile Include="src\sql-parser\src\parser\flex_lexer.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\SQLParser.cpp"> <ClCompile Include="src\sql-parser\src\SQLParser.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\SQLParserResult.cpp"> <ClCompile Include="src\sql-parser\src\SQLParserResult.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\sql\CreateStatement.cpp"> <ClCompile Include="src\sql-parser\src\sql\CreateStatement.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\sql\Expr.cpp"> <ClCompile Include="src\sql-parser\src\sql\Expr.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\sql\PrepareStatement.cpp"> <ClCompile Include="src\sql-parser\src\sql\PrepareStatement.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\sql\SQLStatement.cpp"> <ClCompile Include="src\sql-parser\src\sql\SQLStatement.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\sql\statements.cpp"> <ClCompile Include="src\sql-parser\src\sql\statements.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sql-parser\src\util\sqlhelper.cpp"> <ClCompile Include="src\sql-parser\src\util\sqlhelper.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLChannel.cpp"> <ClCompile Include="src\SQLChannel.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Statement.cpp"> <ClCompile Include="src\Statement.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\StatementCreator.cpp"> <ClCompile Include="src\StatementCreator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\StatementImpl.cpp"> <ClCompile Include="src\StatementImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Time.cpp"> <ClCompile Include="src\Time.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Transaction.cpp"> <ClCompile Include="src\Transaction.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Transcoder.cpp"> <ClCompile Include="src\Transcoder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,67 +2,67 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="DataCore"> <Filter Include="DataCore">
<UniqueIdentifier>{17dee3c5-eff8-4413-8538-35cde2b4b148}</UniqueIdentifier> <UniqueIdentifier>{ed293173-38e4-456c-8b1b-fbb4edb534a2}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="DataCore\Header Files"> <Filter Include="DataCore\Header Files">
<UniqueIdentifier>{b47de74d-a006-494a-92ca-14bb740b6a8f}</UniqueIdentifier> <UniqueIdentifier>{09512048-b662-4412-9d66-9278f5127b64}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="DataCore\Source Files"> <Filter Include="DataCore\Source Files">
<UniqueIdentifier>{2fae20d2-553e-4d22-a054-7bdcaf5cfa18}</UniqueIdentifier> <UniqueIdentifier>{e5a0ae46-4dcb-44ee-ad87-6c29296fdb75}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SessionPooling"> <Filter Include="SessionPooling">
<UniqueIdentifier>{8e430176-5758-4f18-a0a1-a2e47cd5d20a}</UniqueIdentifier> <UniqueIdentifier>{3ab0b097-7c41-423d-a520-9955c13afd07}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SessionPooling\Header Files"> <Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{f46d9d0c-aaad-4c18-b335-aa902649086a}</UniqueIdentifier> <UniqueIdentifier>{fb8ac504-99e9-4c9f-acf9-cd7e199ccbb8}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SessionPooling\Source Files"> <Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{a2f2316a-c2ec-45b6-bfb5-9c7ea4bf8406}</UniqueIdentifier> <UniqueIdentifier>{96d47a24-bbc7-4503-98f1-722cb7e6c525}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser"> <Filter Include="SQLParser">
<UniqueIdentifier>{396b1821-ed93-4c83-884c-d60497a66f11}</UniqueIdentifier> <UniqueIdentifier>{722167c1-e2c8-4893-bf49-f06a56e4475a}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\Header Files"> <Filter Include="SQLParser\Header Files">
<UniqueIdentifier>{77bc6a77-c249-4be3-80b3-86841c7b6297}</UniqueIdentifier> <UniqueIdentifier>{0fd0e46c-2c11-4305-bf67-4e39819f3600}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\Source Files"> <Filter Include="SQLParser\Source Files">
<UniqueIdentifier>{c74693c2-b89b-4615-ba48-44ef418f9ab6}</UniqueIdentifier> <UniqueIdentifier>{52fb64cd-2a53-461c-8056-ee3178aac103}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\parser"> <Filter Include="SQLParser\parser">
<UniqueIdentifier>{6fadb32c-ee06-4f9e-937e-28203e2504d1}</UniqueIdentifier> <UniqueIdentifier>{7ba52d24-1fb2-465f-8937-71c5f1c2aeef}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\parser\Header Files"> <Filter Include="SQLParser\parser\Header Files">
<UniqueIdentifier>{3c5d1163-2067-4363-abf6-dc040e3613cc}</UniqueIdentifier> <UniqueIdentifier>{8d74d8c7-dae7-4a18-858f-09bcf7f09f1b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\parser\Source Files"> <Filter Include="SQLParser\parser\Source Files">
<UniqueIdentifier>{15321502-9c36-49f6-a094-90a9de888c41}</UniqueIdentifier> <UniqueIdentifier>{8f9442dc-d276-42ed-829a-3112f876419b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\sql"> <Filter Include="SQLParser\sql">
<UniqueIdentifier>{4f383c22-b278-40e9-bb9a-b25fd0db10a3}</UniqueIdentifier> <UniqueIdentifier>{57e26b75-95c1-4d32-8239-7a303d573048}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\sql\Header Files"> <Filter Include="SQLParser\sql\Header Files">
<UniqueIdentifier>{f037c038-fa66-4ea9-ab1e-187aac6f52ce}</UniqueIdentifier> <UniqueIdentifier>{f7ab1f90-c32d-4108-9cba-3a380c12af48}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\sql\Source Files"> <Filter Include="SQLParser\sql\Source Files">
<UniqueIdentifier>{fda6c009-20d7-4eb4-a9be-fbb1d578d166}</UniqueIdentifier> <UniqueIdentifier>{70937b86-7f9e-42eb-a1cb-532959b076b3}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\util"> <Filter Include="SQLParser\util">
<UniqueIdentifier>{5e4a847f-8c8d-40f0-aa79-03b211bd5ac9}</UniqueIdentifier> <UniqueIdentifier>{426b95e7-0f6b-4a2e-8227-5d1f2a96c38b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\util\Header Files"> <Filter Include="SQLParser\util\Header Files">
<UniqueIdentifier>{dd5133dc-82db-4f2a-92f6-91dba81a222b}</UniqueIdentifier> <UniqueIdentifier>{59e3d7d8-f310-4e86-a84e-9e5648e238f8}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\util\Source Files"> <Filter Include="SQLParser\util\Source Files">
<UniqueIdentifier>{8d7c5808-50f5-4790-b35c-77350ea2b16c}</UniqueIdentifier> <UniqueIdentifier>{8b87b125-d1e5-4037-85fa-2edd7d77e940}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Logging"> <Filter Include="Logging">
<UniqueIdentifier>{6fe708ec-ec55-4aeb-9be3-2b1aa30f3cb1}</UniqueIdentifier> <UniqueIdentifier>{307ff9fb-35fa-4c93-a388-e4072672006d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Logging\Header Files"> <Filter Include="Logging\Header Files">
<UniqueIdentifier>{c8f1ad0b-aede-43b8-9b01-ad4cbf24f45b}</UniqueIdentifier> <UniqueIdentifier>{7137d8b1-eeb5-4fee-b080-d7c87dc42a43}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Logging\Source Files"> <Filter Include="Logging\Source Files">
<UniqueIdentifier>{6845af31-0048-47ba-96f7-48baed099606}</UniqueIdentifier> <UniqueIdentifier>{55caa527-40a5-4ee1-a9f2-58b13550166f}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataMySQLA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataMySQLA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataMySQLmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataMySQLmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataMySQLmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataMySQLmtd</TargetName>
@ -346,6 +346,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\binA64\PocoDataMySQLA64d.dll</OutputFile> <OutputFile>..\..\binA64\PocoDataMySQLA64d.dll</OutputFile>
@ -379,6 +381,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\binA64\PocoDataMySQLA64.dll</OutputFile> <OutputFile>..\..\binA64\PocoDataMySQLA64.dll</OutputFile>
@ -410,6 +414,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataMySQLmtd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataMySQLmtd.lib</OutputFile>
@ -436,6 +442,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataMySQLmt.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataMySQLmt.lib</OutputFile>
@ -459,6 +467,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataMySQLmdd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataMySQLmdd.lib</OutputFile>
@ -485,6 +495,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataMySQLmd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataMySQLmd.lib</OutputFile>
@ -508,6 +520,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin\PocoDataMySQLd.dll</OutputFile> <OutputFile>..\..\bin\PocoDataMySQLd.dll</OutputFile>
@ -541,6 +555,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin\PocoDataMySQL.dll</OutputFile> <OutputFile>..\..\bin\PocoDataMySQL.dll</OutputFile>
@ -572,6 +588,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataMySQLmtd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataMySQLmtd.lib</OutputFile>
@ -598,6 +616,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataMySQLmt.lib</OutputFile> <OutputFile>..\..\lib\PocoDataMySQLmt.lib</OutputFile>
@ -621,6 +641,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataMySQLmdd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataMySQLmdd.lib</OutputFile>
@ -647,6 +669,8 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataMySQLmd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataMySQLmd.lib</OutputFile>
@ -670,6 +694,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin64\PocoDataMySQL64d.dll</OutputFile> <OutputFile>..\..\bin64\PocoDataMySQL64d.dll</OutputFile>
@ -703,6 +729,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin64\PocoDataMySQL64.dll</OutputFile> <OutputFile>..\..\bin64\PocoDataMySQL64.dll</OutputFile>
@ -734,6 +762,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataMySQLmtd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataMySQLmtd.lib</OutputFile>
@ -760,6 +790,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataMySQLmt.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataMySQLmt.lib</OutputFile>
@ -783,6 +815,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataMySQLmdd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataMySQLmdd.lib</OutputFile>
@ -809,6 +843,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataMySQLmd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataMySQLmd.lib</OutputFile>
@ -817,33 +853,53 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Binder.cpp"> <ClCompile Include="src\Binder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Connector.cpp"> <ClCompile Include="src\Connector.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Extractor.cpp"> <ClCompile Include="src\Extractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MySQLException.cpp"> <ClCompile Include="src\MySQLException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MySQLStatementImpl.cpp"> <ClCompile Include="src\MySQLStatementImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ResultMetadata.cpp"> <ClCompile Include="src\ResultMetadata.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionHandle.cpp"> <ClCompile Include="src\SessionHandle.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionImpl.cpp"> <ClCompile Include="src\SessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\StatementExecutor.cpp"> <ClCompile Include="src\StatementExecutor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Utility.cpp"> <ClCompile Include="src\Utility.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataODBCA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataODBCA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataODBCmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataODBCmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataODBCmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataODBCmtd</TargetName>
@ -346,6 +346,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -380,6 +382,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -412,6 +416,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataODBCmtd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataODBCmtd.lib</OutputFile>
@ -438,6 +444,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataODBCmt.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataODBCmt.lib</OutputFile>
@ -461,6 +469,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataODBCmdd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataODBCmdd.lib</OutputFile>
@ -487,6 +497,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataODBCmd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataODBCmd.lib</OutputFile>
@ -510,6 +522,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -544,6 +558,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -576,6 +592,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataODBCmtd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataODBCmtd.lib</OutputFile>
@ -602,6 +620,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataODBCmt.lib</OutputFile> <OutputFile>..\..\lib\PocoDataODBCmt.lib</OutputFile>
@ -625,6 +645,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataODBCmdd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataODBCmdd.lib</OutputFile>
@ -651,6 +673,8 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -675,6 +699,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -709,6 +735,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -741,6 +769,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataODBCmtd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataODBCmtd.lib</OutputFile>
@ -767,6 +797,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataODBCmt.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataODBCmt.lib</OutputFile>
@ -790,6 +822,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataODBCmdd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataODBCmdd.lib</OutputFile>
@ -816,6 +850,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataODBCmd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataODBCmd.lib</OutputFile>
@ -846,42 +882,68 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Binder.cpp"> <ClCompile Include="src\Binder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ConnectionHandle.cpp"> <ClCompile Include="src\ConnectionHandle.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Connector.cpp"> <ClCompile Include="src\Connector.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\EnvironmentHandle.cpp"> <ClCompile Include="src\EnvironmentHandle.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Extractor.cpp"> <ClCompile Include="src\Extractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCException.cpp"> <ClCompile Include="src\ODBCException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCMetaColumn.cpp"> <ClCompile Include="src\ODBCMetaColumn.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCStatementImpl.cpp"> <ClCompile Include="src\ODBCStatementImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Parameter.cpp"> <ClCompile Include="src\Parameter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Preparator.cpp"> <ClCompile Include="src\Preparator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionImpl.cpp"> <ClCompile Include="src\SessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TypeInfo.cpp"> <ClCompile Include="src\TypeInfo.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Unicode.cpp"> <ClCompile Include="src\Unicode.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Unicode_UNIXODBC.cpp"> <ClCompile Include="src\Unicode_UNIXODBC.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
@ -903,6 +965,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Unicode_WIN32.cpp"> <ClCompile Include="src\Unicode_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">true</ExcludedFromBuild>
@ -924,9 +988,13 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Utility.cpp"> <ClCompile Include="src\Utility.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,13 +2,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="ODBC"> <Filter Include="ODBC">
<UniqueIdentifier>{f34e7de5-7ef8-4dd2-b62f-7a06b6a35a67}</UniqueIdentifier> <UniqueIdentifier>{e7e58a10-6d53-4be9-a342-62628c6feb5f}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ODBC\Header Files"> <Filter Include="ODBC\Header Files">
<UniqueIdentifier>{65266e55-5683-4419-9976-d381eb3a37b1}</UniqueIdentifier> <UniqueIdentifier>{efd7c933-a42d-4f50-9f6a-c8444bf44c93}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ODBC\Source Files"> <Filter Include="ODBC\Source Files">
<UniqueIdentifier>{0217b02a-6b9b-47ee-963c-837798f77fe9}</UniqueIdentifier> <UniqueIdentifier>{398266a3-c6d5-4987-8910-a35da55d401e}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -394,6 +394,7 @@ private:
{ {
SQLINTEGER colSize = 0; SQLINTEGER colSize = 0;
SQLSMALLINT decDigits = 0; SQLSMALLINT decDigits = 0;
getColSizeAndPrecision(pos, cDataType, colSize, decDigits); getColSizeAndPrecision(pos, cDataType, colSize, decDigits);
_lengthIndicator.push_back(0); _lengthIndicator.push_back(0);

View File

@ -20,6 +20,7 @@
#include "Poco/Data/ODBC/ODBC.h" #include "Poco/Data/ODBC/ODBC.h"
#include "Poco/Data/ODBC/EnvironmentHandle.h" #include "Poco/Data/ODBC/EnvironmentHandle.h"
#include "Poco/Data/ODBC/Error.h"
#ifdef POCO_OS_FAMILY_WINDOWS #ifdef POCO_OS_FAMILY_WINDOWS
#include <windows.h> #include <windows.h>
#endif #endif
@ -33,16 +34,23 @@ namespace ODBC {
class SessionImpl; class SessionImpl;
class ODBC_API ConnectionHandle class ODBC_API ConnectionHandle
/// ODBC connection handle class /// ODBC connection handle class
{ {
public: public:
ConnectionHandle(const std::string& connectString = "", SQLULEN timeout = 5); static const std::string UNSUPPORTED_SQLSTATE;
static const std::string GEN_ERR_SQLSTATE;
static const std::string CANT_SET_ATTR_SQLSTATE;
ConnectionHandle(const std::string& connectString = "", SQLULEN loginTimeout = 0, SQLULEN timeout = 0);
/// Creates the ConnectionHandle. /// Creates the ConnectionHandle.
///
/// NOTE: some drivers/DBMS do not distinguish between login and connection timeouts,
/// and setting one timeout overwrites the other.
~ConnectionHandle(); ~ConnectionHandle();
/// Creates the ConnectionHandle. /// Creates the ConnectionHandle.
bool connect(const std::string& connectString = "", SQLULEN timeout = 5); bool connect(const std::string& connectString = "", SQLULEN loginTimeout = 0, SQLULEN timeout = 0);
/// Connects the handle to the database. /// Connects the handle to the database.
bool disconnect(); bool disconnect();
@ -51,12 +59,20 @@ public:
bool isConnected() const; bool isConnected() const;
/// Returns true if connected. /// Returns true if connected.
void setTimeout(SQLULEN timeout); void setTimeout(int timeout);
/// Sets the connection timeout in seconds. /// Sets the connection timeout in seconds.
int getTimeout() const; int getTimeout() const;
/// Returns the connection timeout in seconds. /// Returns the connection timeout in seconds.
void setLoginTimeout(SQLULEN timeout);
/// Sets the login timeout in seconds.
/// Must be called before the connection attempt.
int getLoginTimeout() const;
/// Returns the login timeout in seconds.
/// Must be called before the connection attempt.
const SQLHDBC& handle() const; const SQLHDBC& handle() const;
/// Returns const reference to handle; /// Returns const reference to handle;
@ -83,6 +99,26 @@ private:
void free(); void free();
/// Frees the connection handle. /// Frees the connection handle.
void setTimeoutImpl(SQLULEN timeout, SQLINTEGER attribute);
/// Sets the timeout for the attribute.
int getTimeoutImpl(SQLINTEGER attribute) const;
/// Returns the timeout for the attribute.
void setTimeouts(SQLULEN loginTimeout, SQLULEN timeout);
bool isUnsupported(const ConnectionError& e) const;
/// Returns true if SQLSTATE is "HYC000"
/// (Optional feature not implemented)
bool isGenError(const ConnectionError& e) const;
/// Returns true if SQLSTATE is "HY000"
/// (General error)
bool cantSetAttr(const ConnectionError& e) const;
/// Returns true if SQLSTATE is "HY011"
/// (Can't set attribute)
ConnectionHandle(const ConnectionHandle&); ConnectionHandle(const ConnectionHandle&);
const ConnectionHandle& operator=(const ConnectionHandle&); const ConnectionHandle& operator=(const ConnectionHandle&);
@ -136,6 +172,30 @@ inline SQLHDBC& ConnectionHandle::handle()
} }
inline void ConnectionHandle::setTimeout(int timeout)
{
setTimeoutImpl(static_cast<SQLULEN>(timeout), SQL_ATTR_CONNECTION_TIMEOUT);
}
inline int ConnectionHandle::getTimeout() const
{
return getTimeoutImpl(SQL_ATTR_CONNECTION_TIMEOUT);
}
inline void ConnectionHandle::setLoginTimeout(SQLULEN timeout)
{
setTimeoutImpl(timeout, SQL_ATTR_LOGIN_TIMEOUT);
}
inline int ConnectionHandle::getLoginTimeout() const
{
return getTimeoutImpl(SQL_ATTR_LOGIN_TIMEOUT);
}
} } } // namespace Poco::Data::ODBC } } } // namespace Poco::Data::ODBC

View File

@ -25,6 +25,7 @@
#include "Poco/Data/AbstractPreparator.h" #include "Poco/Data/AbstractPreparator.h"
#include "Poco/Data/Constants.h" #include "Poco/Data/Constants.h"
#include "Poco/Data/LOB.h" #include "Poco/Data/LOB.h"
#include "Poco/Types.h"
#include "Poco/Any.h" #include "Poco/Any.h"
#include "Poco/DynamicAny.h" #include "Poco/DynamicAny.h"
#include "Poco/DateTime.h" #include "Poco/DateTime.h"
@ -895,7 +896,7 @@ inline void Preparator::prepare(std::size_t pos, const long&)
inline void Preparator::prepare(std::size_t pos, const unsigned long&) inline void Preparator::prepare(std::size_t pos, const unsigned long&)
{ {
prepareFixedSize<long>(pos, SQL_C_SLONG); prepareFixedSize<unsigned long>(pos, SQL_C_ULONG);
} }

View File

@ -161,6 +161,14 @@ public:
int maxStatementLength() const; int maxStatementLength() const;
/// Returns maximum length of SQL statement allowed by driver. /// Returns maximum length of SQL statement allowed by driver.
void setLoginTimeout(const std::string&, const Poco::Any& value);
/// Sets the timeout (in seconds) for the session login.
/// Value must be of type (unsigned) int.
/// It must be set prior to logging in.
Poco::Any getLoginTimeout(const std::string&) const;
/// Returns the timeout (in seconds) for the session login.
void setQueryTimeout(const std::string&, const Poco::Any& value); void setQueryTimeout(const std::string&, const Poco::Any& value);
/// Sets the timeout (in seconds) for queries. /// Sets the timeout (in seconds) for queries.
/// Value must be of type int. /// Value must be of type int.
@ -312,6 +320,12 @@ inline bool SessionImpl::isTransactionIsolation(Poco::UInt32 ti) const
} }
inline Poco::Any SessionImpl::getLoginTimeout(const std::string&) const
{
return _db.getLoginTimeout();
}
inline void SessionImpl::setQueryTimeout(const std::string&, const Poco::Any& value) inline void SessionImpl::setQueryTimeout(const std::string&, const Poco::Any& value)
{ {
_queryTimeout = Poco::AnyCast<int>(value); _queryTimeout = Poco::AnyCast<int>(value);

View File

@ -510,6 +510,7 @@ void Binder::getColSizeAndPrecision(std::size_t pos,
SQLSMALLINT& decDigits, SQLSMALLINT& decDigits,
std::size_t actualSize) std::size_t actualSize)
{ {
SQLSMALLINT sqlDataType = Utility::sqlDataType(cDataType);
colSize = 0; colSize = 0;
decDigits = 0; decDigits = 0;
@ -522,6 +523,9 @@ void Binder::getColSizeAndPrecision(std::size_t pos,
bool foundPrec(false); bool foundPrec(false);
foundSize = _pTypeInfo->tryGetInfo(cDataType, "COLUMN_SIZE", tmp); foundSize = _pTypeInfo->tryGetInfo(cDataType, "COLUMN_SIZE", tmp);
if (foundSize) colSize = tmp; if (foundSize) colSize = tmp;
else foundSize = _pTypeInfo->tryGetInfo(sqlDataType, "COLUMN_SIZE", tmp);
if (foundSize) colSize = tmp;
if (actualSize > colSize) if (actualSize > colSize)
{ {
throw LengthExceededException(Poco::format("Error binding column %z size=%z, max size=%ld)", throw LengthExceededException(Poco::format("Error binding column %z size=%z, max size=%ld)",
@ -529,6 +533,8 @@ void Binder::getColSizeAndPrecision(std::size_t pos,
} }
foundPrec = _pTypeInfo->tryGetInfo(cDataType, "MAXIMUM_SCALE", tmp); foundPrec = _pTypeInfo->tryGetInfo(cDataType, "MAXIMUM_SCALE", tmp);
if (foundPrec) decDigits = tmp; if (foundPrec) decDigits = tmp;
else foundPrec = _pTypeInfo->tryGetInfo(sqlDataType, "MAXIMUM_SCALE", tmp);
if (foundPrec) decDigits = tmp;
if (foundSize && foundPrec) if (foundSize && foundPrec)
return; return;

View File

@ -24,12 +24,18 @@ namespace Data {
namespace ODBC { namespace ODBC {
ConnectionHandle::ConnectionHandle(const std::string& connectString, SQLULEN timeout): _pEnvironment(nullptr), const std::string ConnectionHandle::UNSUPPORTED_SQLSTATE = "HYC00";
const std::string ConnectionHandle::GEN_ERR_SQLSTATE = "HY000";
const std::string ConnectionHandle::CANT_SET_ATTR_SQLSTATE = "HY011";
ConnectionHandle::ConnectionHandle(const std::string& connectString, SQLULEN loginTimeout, SQLULEN timeout):
_pEnvironment(nullptr),
_hdbc(SQL_NULL_HDBC), _hdbc(SQL_NULL_HDBC),
_connectString(connectString) _connectString(connectString)
{ {
alloc(); alloc();
setTimeout(timeout); setTimeouts(loginTimeout, timeout);
} }
@ -76,7 +82,29 @@ void ConnectionHandle::free()
} }
bool ConnectionHandle::connect(const std::string& connectString, SQLULEN timeout) void ConnectionHandle::setTimeouts(SQLULEN loginTimeout, SQLULEN timeout)
{
if (loginTimeout)
{
try
{
setLoginTimeout(loginTimeout);
}
catch(const NotSupportedException&) {}
}
if (timeout)
{
try
{
setTimeout(timeout);
}
catch(const NotSupportedException&) {}
}
}
bool ConnectionHandle::connect(const std::string& connectString, SQLULEN loginTimeout, SQLULEN timeout)
{ {
if (isConnected()) if (isConnected())
throw Poco::InvalidAccessException("ODBC: connection already established."); throw Poco::InvalidAccessException("ODBC: connection already established.");
@ -91,6 +119,9 @@ bool ConnectionHandle::connect(const std::string& connectString, SQLULEN timeout
SQLSMALLINT result; SQLSMALLINT result;
if (!_pEnvironment) alloc(); if (!_pEnvironment) alloc();
setTimeouts(loginTimeout, timeout);
if (Utility::isError(Poco::Data::ODBC::SQLDriverConnect(_hdbc if (Utility::isError(Poco::Data::ODBC::SQLDriverConnect(_hdbc
, NULL , NULL
,(SQLCHAR*) _connectString.c_str() ,(SQLCHAR*) _connectString.c_str()
@ -100,12 +131,28 @@ bool ConnectionHandle::connect(const std::string& connectString, SQLULEN timeout
, &result , &result
, SQL_DRIVER_NOPROMPT))) , SQL_DRIVER_NOPROMPT)))
{ {
disconnect();
ConnectionError err(_hdbc); ConnectionError err(_hdbc);
disconnect();
throw ConnectionFailedException(err.toString()); throw ConnectionFailedException(err.toString());
} }
return _hdbc != SQL_NULL_HDBC;; try
{
// Setting timeouts before connection is valid by standard (as it makes sense for login timeout),
// but not all drivers comply, so we have to check and try again after succesful connection.
// Furthermore, it appears that Oracle has only one timeout, so it is not possible to have
// different login and connection timeouts. Last but not least, some ODBC drivers (eg. DataDirect
// for Oracle) flat out refuse to set login timeout and return error - that's why these calls
// are wrapped in try/catch and silently ignore errors.
if (getTimeout() != timeout)
setTimeout(timeout);
if (getLoginTimeout() != loginTimeout)
setLoginTimeout(loginTimeout);
}
catch(NotSupportedException&){}
catch(InvalidAccessException&){}
return _hdbc != SQL_NULL_HDBC;
} }
@ -120,38 +167,107 @@ bool ConnectionHandle::disconnect()
} }
void ConnectionHandle::setTimeout(SQLULEN timeout) void ConnectionHandle::setTimeoutImpl(SQLULEN timeout, SQLINTEGER attribute)
{ {
if (Utility::isError(SQLSetConnectAttr(_hdbc, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) timeout, 0))) if (attribute != SQL_ATTR_LOGIN_TIMEOUT && attribute != SQL_ATTR_CONNECTION_TIMEOUT)
throw InvalidArgumentException(Poco::format("ODBC::ConnectionHandle::setTimeoutImpl(%d)", attribute));
if (Utility::isError(SQLSetConnectAttr(_hdbc, attribute, (SQLPOINTER) timeout, 0)))
{ {
ConnectionError e(_hdbc); ConnectionError e(_hdbc);
std::string name;
switch (attribute)
{
case SQL_ATTR_LOGIN_TIMEOUT:
name = "LOGIN"s;
break;
case SQL_ATTR_CONNECTION_TIMEOUT:
name = "CONNECTION"s;
break;
default:
break;
}
if (isUnsupported(e))
throw NotSupportedException(Poco::format("ConnectionHandle::setTimeoutImpl(%s)", name));
else if (isGenError(e) || cantSetAttr(e))
throw InvalidAccessException(Poco::format("ConnectionHandle::setTimeoutImpl(%s)", name));
throw ConnectionFailedException(e.toString()); throw ConnectionFailedException(e.toString());
} }
} }
int ConnectionHandle::getTimeout() const int ConnectionHandle::getTimeoutImpl(SQLINTEGER attribute) const
{ {
SQLULEN timeout = 0; SQLUINTEGER timeout = 0;
if (Utility::isError(SQLGetConnectAttr(_hdbc, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0))) if (Utility::isError(SQLGetConnectAttr(_hdbc, attribute, &timeout, sizeof(timeout), 0)))
{ {
ConnectionError e(_hdbc); ConnectionError e(_hdbc);
if (isUnsupported(e))
throw NotSupportedException("ConnectionHandle::getTimeoutImpl(%s)");
throw ConnectionFailedException(e.toString()); throw ConnectionFailedException(e.toString());
} }
return static_cast<int>(timeout); return static_cast<int>(timeout);
} }
bool ConnectionHandle::isUnsupported(const ConnectionError& e) const
{
const ConnectionDiagnostics& cd = e.diagnostics();
int diagRecs = cd.count();
for (int i = 0; i < diagRecs; ++i)
{
if (cd.sqlState(i) == UNSUPPORTED_SQLSTATE)
{
return true;
}
}
return false;
}
bool ConnectionHandle::isGenError(const ConnectionError& e) const
{
const ConnectionDiagnostics& cd = e.diagnostics();
int diagRecs = cd.count();
for (int i = 0; i < diagRecs; ++i)
{
if (cd.sqlState(i) == GEN_ERR_SQLSTATE)
{
return true;
}
}
return false;
}
bool ConnectionHandle::cantSetAttr(const ConnectionError& e) const
{
const ConnectionDiagnostics& cd = e.diagnostics();
int diagRecs = cd.count();
for (int i = 0; i < diagRecs; ++i)
{
if (cd.sqlState(i) == CANT_SET_ATTR_SQLSTATE)
{
return true;
}
}
return false;
}
bool ConnectionHandle::isConnected() const bool ConnectionHandle::isConnected() const
{ {
if (!*this) return false; if (!*this) return false;
SQLULEN value = 0; SQLINTEGER value = -1;
if (Utility::isError(Poco::Data::ODBC::SQLGetConnectAttr(_hdbc, if (Utility::isError(Poco::Data::ODBC::SQLGetConnectAttr(_hdbc,
SQL_ATTR_CONNECTION_DEAD, SQL_ATTR_CONNECTION_DEAD,
&value, &value,
0, sizeof(value),
0))) return false; 0))) return false;
return (SQL_CD_FALSE == value); return (SQL_CD_FALSE == value);

View File

@ -721,7 +721,7 @@ bool Extractor::extract(std::size_t pos, std::string& val)
else else
ret = extractBoundImpl(pos, result); ret = extractBoundImpl(pos, result);
transcode(result, val); transcode(result, val);
} }
return ret; return ret;

View File

@ -123,6 +123,10 @@ void SessionImpl::addFeatures()
&SessionImpl::setMaxFieldSize, &SessionImpl::setMaxFieldSize,
&SessionImpl::getMaxFieldSize); &SessionImpl::getMaxFieldSize);
addProperty("loginTimeout",
&SessionImpl::setLoginTimeout,
&SessionImpl::getLoginTimeout);
addProperty("queryTimeout", addProperty("queryTimeout",
&SessionImpl::setQueryTimeout, &SessionImpl::setQueryTimeout,
&SessionImpl::getQueryTimeout); &SessionImpl::getQueryTimeout);
@ -153,9 +157,7 @@ void SessionImpl::open(const std::string& connect)
if (connectionString().empty()) if (connectionString().empty())
throw InvalidArgumentException("SessionImpl::open(): Connection string empty"); throw InvalidArgumentException("SessionImpl::open(): Connection string empty");
SQLULEN tout = static_cast<SQLULEN>(getLoginTimeout()); if (_db.connect(connectionString()))
if (_db.connect(connectionString(), tout))
{ {
setProperty("handle", _db.handle()); setProperty("handle", _db.handle());
@ -245,26 +247,30 @@ inline Poco::Any SessionImpl::getCursorUse(const std::string&) const
void SessionImpl::setConnectionTimeout(std::size_t timeout) void SessionImpl::setConnectionTimeout(std::size_t timeout)
{ {
SQLUINTEGER value = static_cast<SQLUINTEGER>(timeout); SQLULEN value = static_cast<SQLUINTEGER>(timeout);
_db.setTimeout(value);
checkError(Poco::Data::ODBC::SQLSetConnectAttr(_db,
SQL_ATTR_CONNECTION_TIMEOUT,
&value,
SQL_IS_UINTEGER), "Failed to set connection timeout.");
} }
std::size_t SessionImpl::getConnectionTimeout() const std::size_t SessionImpl::getConnectionTimeout() const
{ {
SQLULEN value = 0; return _db.getTimeout();
}
checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db,
SQL_ATTR_CONNECTION_TIMEOUT,
&value,
0,
0), "Failed to get connection timeout.");
return value; void SessionImpl::setLoginTimeout(const std::string&, const Poco::Any& value)
{
int timeout = 0;
try
{
timeout = Poco::AnyCast<int>(value);
}
catch(const Poco::BadCastException&)
{
timeout = Poco::AnyCast<unsigned int>(value);
}
_db.setLoginTimeout(timeout);
} }
@ -352,8 +358,10 @@ bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti) const
{ {
if (isTransaction()) throw InvalidAccessException(); if (isTransaction()) throw InvalidAccessException();
bool retval = true;
Poco::UInt32 old = getTransactionIsolation(); Poco::UInt32 old = getTransactionIsolation();
if (old == ti) return true;
bool retval = true;
try { setTransactionIsolationImpl(ti); } try { setTransactionIsolationImpl(ti); }
catch (Poco::Exception&) { retval = false; } catch (Poco::Exception&) { retval = false; }
setTransactionIsolationImpl(old); setTransactionIsolationImpl(old);

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -922,36 +958,58 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Driver.cpp"> <ClCompile Include="src\Driver.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCAccessTest.cpp"> <ClCompile Include="src\ODBCAccessTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCDB2Test.cpp"> <ClCompile Include="src\ODBCDB2Test.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCMySQLTest.cpp"> <ClCompile Include="src\ODBCMySQLTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCOracleTest.cpp"> <ClCompile Include="src\ODBCOracleTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCPostgreSQLTest.cpp"> <ClCompile Include="src\ODBCPostgreSQLTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCSQLiteTest.cpp"> <ClCompile Include="src\ODBCSQLiteTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCSQLServerTest.cpp"> <ClCompile Include="src\ODBCSQLServerTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCTest.cpp"> <ClCompile Include="src\ODBCTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ODBCTestSuite.cpp"> <ClCompile Include="src\ODBCTestSuite.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLExecutor.cpp"> <ClCompile Include="src\SQLExecutor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,28 +2,28 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="ODBC"> <Filter Include="ODBC">
<UniqueIdentifier>{179a380b-3910-49b1-bd76-2fa7222a96cb}</UniqueIdentifier> <UniqueIdentifier>{c7e9a1ea-73f4-4226-b310-b265201e0be9}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ODBC\Header Files"> <Filter Include="ODBC\Header Files">
<UniqueIdentifier>{27ed4014-dc16-4c25-84cd-1598bcc2b8ab}</UniqueIdentifier> <UniqueIdentifier>{2348173e-2e62-4809-99ea-676ebb4198c0}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ODBC\Source Files"> <Filter Include="ODBC\Source Files">
<UniqueIdentifier>{44fb61ac-3639-400f-a868-2cfc81338e8d}</UniqueIdentifier> <UniqueIdentifier>{8926ceae-a008-4b2d-accb-ff1e4f4a1b77}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite"> <Filter Include="_Suite">
<UniqueIdentifier>{68ef2164-2dbb-48f6-85d9-d22e20cebaf2}</UniqueIdentifier> <UniqueIdentifier>{30658ecd-cf47-42ec-8568-5acc3a624a78}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite\Header Files"> <Filter Include="_Suite\Header Files">
<UniqueIdentifier>{36208f03-46c7-4ac6-9be6-c04374dfb886}</UniqueIdentifier> <UniqueIdentifier>{5192786d-b801-40d6-a989-f7fdc825f525}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite\Source Files"> <Filter Include="_Suite\Source Files">
<UniqueIdentifier>{2a8314f2-90c2-4649-8e5e-1ea1ab61200b}</UniqueIdentifier> <UniqueIdentifier>{4a23e42f-ef34-4ab0-b282-21cf3de054b9}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Driver"> <Filter Include="_Driver">
<UniqueIdentifier>{7d675381-7b81-43fd-882e-f2401eabdb9e}</UniqueIdentifier> <UniqueIdentifier>{90adb98e-9140-4322-88ba-3ed19efe888c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Driver\Source Files"> <Filter Include="_Driver\Source Files">
<UniqueIdentifier>{f178aec2-ceb4-4c7b-9d88-4cb2bdb516cc}</UniqueIdentifier> <UniqueIdentifier>{099c216f-5416-41a0-b28d-fb3156debbcd}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -164,7 +164,7 @@ void ODBCMySQLTest::testNull()
recreateNullsTable("NOT NULL"); recreateNullsTable("NOT NULL");
_pSession->setFeature("autoBind", bindValue(i)); _pSession->setFeature("autoBind", bindValue(i));
_pSession->setFeature("autoExtract", bindValue(i+1)); _pSession->setFeature("autoExtract", bindValue(i+1));
_pExecutor->notNulls("HY000"); _pExecutor->notNulls({"HY000"});
i += 2; i += 2;
} }

View File

@ -41,7 +41,19 @@ using Poco::DynamicAny;
using Poco::DateTime; using Poco::DateTime;
#define ORACLE_ODBC_DRIVER "Oracle 21 ODBC driver" //#define EASYSOFT_ODBC
//#define DATADIRECT_ODBC
#define DEVART_ODBC
#ifdef EASYSOFT_ODBC
# define ORACLE_ODBC_DRIVER "ORACLE"
#elif defined(DATADIRECT_ODBC)
# define ORACLE_ODBC_DRIVER "Oracle Wire Protocol"
#elif defined(DEVART_ODBC)
# define ORACLE_ODBC_DRIVER "Devart ODBC Driver for Oracle"
#else
# define ORACLE_ODBC_DRIVER "Oracle 21 ODBC driver"
#endif
#define ORACLE_DSN "PocoDataOracleTest" #define ORACLE_DSN "PocoDataOracleTest"
#define ORACLE_SERVER POCO_ODBC_TEST_DATABASE_SERVER #define ORACLE_SERVER POCO_ODBC_TEST_DATABASE_SERVER
#define ORACLE_PORT "1521" #define ORACLE_PORT "1521"
@ -56,6 +68,15 @@ std::string ODBCOracleTest::_driver = ORACLE_ODBC_DRIVER;
std::string ODBCOracleTest::_dsn = ORACLE_DSN; std::string ODBCOracleTest::_dsn = ORACLE_DSN;
std::string ODBCOracleTest::_uid = ORACLE_UID; std::string ODBCOracleTest::_uid = ORACLE_UID;
std::string ODBCOracleTest::_pwd = ORACLE_PWD; std::string ODBCOracleTest::_pwd = ORACLE_PWD;
#ifdef EASYSOFT_ODBC
std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};DB=" ORACLE_SID ";UID=" ORACLE_UID ";PWD=" ORACLE_PWD ";";
#elif defined(DATADIRECT_ODBC)
std::string ODBCOracleTest::_connectString = "DRIVER=DataDirect 8.0 Oracle Wire Protocol;"
"HOST=" ORACLE_SERVER ";PORT=" ORACLE_PORT ";UID=" ORACLE_UID ";PWD=" ORACLE_PWD ";SERVICENAME=" ORACLE_SID ";";
#elif defined(DEVART_ODBC)
std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};Direct=True;"
"Host=" ORACLE_SERVER ";Service Name=" ORACLE_SID ";User ID=" ORACLE_UID ";Password=" ORACLE_PWD ";";
#else
std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};" std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};"
"DBQ=" ORACLE_SERVER ":" ORACLE_PORT "/" ORACLE_SID ";" "DBQ=" ORACLE_SERVER ":" ORACLE_PORT "/" ORACLE_SID ";"
"UID=" ORACLE_UID ";" "UID=" ORACLE_UID ";"
@ -80,6 +101,7 @@ std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRI
"EXC=F;" // EXEC syntax (T/F), default F "EXC=F;" // EXEC syntax (T/F), default F
"APA=T;" // thread safety (T/F), default T "APA=T;" // thread safety (T/F), default T
"DBA=W;"; // write access (R/W) "DBA=W;"; // write access (R/W)
#endif
const std::string ODBCOracleTest::MULTI_INSERT = const std::string ODBCOracleTest::MULTI_INSERT =
"BEGIN " "BEGIN "
@ -91,7 +113,7 @@ const std::string ODBCOracleTest::MULTI_INSERT =
"END;"; "END;";
const std::string ODBCOracleTest::MULTI_SELECT = const std::string ODBCOracleTest::MULTI_SELECT =
"{CALL multiResultsProcedure()}"; "{CALL multiResultsProcedure(?,?,?,?,?)}";
ODBCOracleTest::ODBCOracleTest(const std::string& name): ODBCOracleTest::ODBCOracleTest(const std::string& name):
@ -112,20 +134,20 @@ void ODBCOracleTest::testBarebone()
"Second VARCHAR(30)," "Second VARCHAR(30),"
"Third BLOB," "Third BLOB,"
"Fourth INTEGER," "Fourth INTEGER,"
"Fifth NUMBER," "Fifth BINARY_FLOAT,"
"Sixth TIMESTAMP)"; "Sixth TIMESTAMP)";
_pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_MANUAL); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_MANUAL);
_pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_BOUND); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_BOUND);
_pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_MANUAL); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_MANUAL);
_pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_BOUND); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_BOUND);
/* TODO - Oracle has different semantics for multiple results
tableCreateString = "CREATE TABLE Test " tableCreateString = "CREATE TABLE Test "
"(First VARCHAR(30)," "(First VARCHAR(30),"
"Second INTEGER," "Second NUMBER,"
"Third NUMBER)"; "Third BINARY_FLOAT)";
*_pSession << "CREATE OR REPLACE " std::string procCreateString = "CREATE OR REPLACE "
"PROCEDURE multiResultsProcedure(ret1 OUT SYS_REFCURSOR, " "PROCEDURE multiResultsProcedure(ret1 OUT SYS_REFCURSOR, "
"ret2 OUT SYS_REFCURSOR," "ret2 OUT SYS_REFCURSOR,"
"ret3 OUT SYS_REFCURSOR," "ret3 OUT SYS_REFCURSOR,"
@ -137,33 +159,37 @@ void ODBCOracleTest::testBarebone()
"OPEN ret3 FOR SELECT * FROM Test WHERE First = '3';" "OPEN ret3 FOR SELECT * FROM Test WHERE First = '3';"
"OPEN ret4 FOR SELECT * FROM Test WHERE First = '4';" "OPEN ret4 FOR SELECT * FROM Test WHERE First = '4';"
"OPEN ret5 FOR SELECT * FROM Test WHERE First = '5';" "OPEN ret5 FOR SELECT * FROM Test WHERE First = '5';"
"END multiResultsProcedure;" , now; "END multiResultsProcedure;";// , now;
_pExecutor->bareboneODBCMultiResultTest(_connectString, _pExecutor->bareboneODBCMultiResultTest(_connectString,
tableCreateString, tableCreateString,
SQLExecutor::PB_IMMEDIATE, SQLExecutor::PB_IMMEDIATE,
SQLExecutor::DE_MANUAL, SQLExecutor::DE_MANUAL,
MULTI_INSERT, MULTI_INSERT,
MULTI_SELECT); MULTI_SELECT,
procCreateString);
_pExecutor->bareboneODBCMultiResultTest(_connectString, _pExecutor->bareboneODBCMultiResultTest(_connectString,
tableCreateString, tableCreateString,
SQLExecutor::PB_IMMEDIATE, SQLExecutor::PB_IMMEDIATE,
SQLExecutor::DE_BOUND, SQLExecutor::DE_BOUND,
MULTI_INSERT, MULTI_INSERT,
MULTI_SELECT); MULTI_SELECT,
procCreateString);
_pExecutor->bareboneODBCMultiResultTest(_connectString, _pExecutor->bareboneODBCMultiResultTest(_connectString,
tableCreateString, tableCreateString,
SQLExecutor::PB_AT_EXEC, SQLExecutor::PB_AT_EXEC,
SQLExecutor::DE_MANUAL, SQLExecutor::DE_MANUAL,
MULTI_INSERT, MULTI_INSERT,
MULTI_SELECT); MULTI_SELECT,
procCreateString);
_pExecutor->bareboneODBCMultiResultTest(_connectString, _pExecutor->bareboneODBCMultiResultTest(_connectString,
tableCreateString, tableCreateString,
SQLExecutor::PB_AT_EXEC, SQLExecutor::PB_AT_EXEC,
SQLExecutor::DE_BOUND, SQLExecutor::DE_BOUND,
MULTI_INSERT, MULTI_INSERT,
MULTI_SELECT); MULTI_SELECT,
procCreateString);
*/
} }
@ -176,7 +202,7 @@ void ODBCOracleTest::testBLOB()
try try
{ {
executor().blob(maxFldSize); executor().blob(maxFldSize);
fail ("must fail"); fail ("must fail", __LINE__, __FILE__);
} }
catch (DataException&) catch (DataException&)
{ {
@ -196,7 +222,7 @@ void ODBCOracleTest::testBLOB()
try try
{ {
executor().blob(maxFldSize+1); executor().blob(maxFldSize+1);
fail ("must fail"); fail ("must fail", __LINE__, __FILE__);
} }
catch (DataException&) { } catch (DataException&) { }
} }
@ -210,7 +236,7 @@ void ODBCOracleTest::testNull()
recreateNullsTable("NOT NULL"); recreateNullsTable("NOT NULL");
session().setFeature("autoBind", bindValue(i)); session().setFeature("autoBind", bindValue(i));
session().setFeature("autoExtract", bindValue(i+1)); session().setFeature("autoExtract", bindValue(i+1));
executor().notNulls("HY000"); executor().notNulls({"HY000", "HY021"});
i += 2; i += 2;
} }
@ -226,6 +252,13 @@ void ODBCOracleTest::testNull()
} }
void ODBCOracleTest::testTransaction()
{
setReadUncommitted(false);
ODBCTest::testTransaction();
}
void ODBCOracleTest::testStoredProcedure() void ODBCOracleTest::testStoredProcedure()
{ {
for (int k = 0; k < 8;) for (int k = 0; k < 8;)
@ -252,7 +285,7 @@ void ODBCOracleTest::testStoredProcedure()
int j = 0; int j = 0;
*_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now; *_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now;
assertTrue (4 == j); assertTrue (4 == j);
*_pSession << "DROP PROCEDURE storedProcedure;", now; dropObject("PROCEDURE", "storedProcedure");
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS " "PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS "
@ -320,7 +353,7 @@ void ODBCOracleTest::testStoredProcedureAny()
*_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now; *_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now;
assertTrue (4 == AnyCast<int>(j)); assertTrue (4 == AnyCast<int>(j));
*_pSession << "DROP PROCEDURE storedProcedure;", now; dropObject("PROCEDURE", "storedProcedure");
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS " "PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS "
@ -353,7 +386,7 @@ void ODBCOracleTest::testStoredProcedureDynamicAny()
*_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now; *_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now;
assertTrue (4 == j); assertTrue (4 == j);
*_pSession << "DROP PROCEDURE storedProcedure;", now; dropObject("PROCEDURE", "storedProcedure");
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS " "PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS "
@ -372,189 +405,213 @@ void ODBCOracleTest::testStoredProcedureDynamicAny()
void ODBCOracleTest::testCursorStoredProcedure() void ODBCOracleTest::testCursorStoredProcedure()
{ {
for (int k = 0; k < 8;) try
{ {
session().setFeature("autoBind", bindValue(k)); for (int k = 0; k < 8;)
session().setFeature("autoExtract", bindValue(k+1)); {
session().setFeature("autoBind", bindValue(k));
session().setFeature("autoExtract", bindValue(k+1));
recreatePersonTable(); recreatePersonTable();
typedef Tuple<std::string, std::string, std::string, int> Person; typedef Tuple<std::string, std::string, std::string, int> Person;
std::vector<Person> people; std::vector<Person> people;
people.push_back(Person("Simpson", "Homer", "Springfield", 42)); people.push_back(Person("Simpson", "Homer", "Springfield", 42));
people.push_back(Person("Simpson", "Bart", "Springfield", 12)); people.push_back(Person("Simpson", "Bart", "Springfield", 12));
people.push_back(Person("Simpson", "Lisa", "Springfield", 10)); people.push_back(Person("Simpson", "Lisa", "Springfield", 10));
*_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now; *_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now;
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"PROCEDURE storedCursorProcedure(ret OUT SYS_REFCURSOR, ageLimit IN NUMBER) IS " "PROCEDURE storedCursorProcedure(ret OUT SYS_REFCURSOR, ageLimit IN NUMBER) IS "
" BEGIN " " BEGIN "
" OPEN ret FOR " " OPEN ret FOR "
" SELECT * " " SELECT * "
" FROM Person " " FROM Person "
" WHERE Age < ageLimit " " WHERE Age < ageLimit "
" ORDER BY Age DESC; " " ORDER BY Age DESC; "
" END storedCursorProcedure;" , now; " END storedCursorProcedure;" , now;
people.clear(); people.clear();
int age = 13; int age = 13;
*_pSession << "{call storedCursorProcedure(?)}", in(age), into(people), now; *_pSession << "{call storedCursorProcedure(?)}", in(age), into(people), now;
assertTrue (2 == people.size()); assertTrue (2 == people.size());
assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]); assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]);
assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]); assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]);
Statement stmt = ((*_pSession << "{call storedCursorProcedure(?)}", in(age), now)); Statement stmt = ((*_pSession << "{call storedCursorProcedure(?)}", in(age), now));
RecordSet rs(stmt); RecordSet rs(stmt);
assertTrue (rs["LastName"] == "Simpson"); assertTrue (rs["LastName"] == "Simpson");
assertTrue (rs["FirstName"] == "Bart"); assertTrue (rs["FirstName"] == "Bart");
assertTrue (rs["Address"] == "Springfield"); assertTrue (rs["Address"] == "Springfield");
assertTrue (rs["Age"] == 12); assertTrue (rs["Age"] == 12);
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
dropObject("PROCEDURE", "storedCursorProcedure"); dropObject("PROCEDURE", "storedCursorProcedure");
k += 2; k += 2;
}
}
catch(const DataException& e)
{
std::cerr << e.displayText() << '\n';
fail ("testCursorStoredProcedure()", __LINE__, __FILE__);
} }
} }
void ODBCOracleTest::testStoredFunction() void ODBCOracleTest::testStoredFunction()
{ {
for (int k = 0; k < 8;) try
{ {
session().setFeature("autoBind", bindValue(k)); for (int k = 0; k < 8;)
session().setFeature("autoExtract", bindValue(k+1)); {
session().setFeature("autoBind", bindValue(k));
session().setFeature("autoExtract", bindValue(k+1));
try{ try{
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction RETURN NUMBER IS " "FUNCTION storedFunction RETURN NUMBER IS "
" BEGIN return(-1); " " BEGIN return(-1); "
" END storedFunction;" , now; " END storedFunction;" , now;
}catch(StatementException& se) { std::cout << se.toString() << std::endl; } }catch(StatementException& se) { std::cout << se.toString() << std::endl; }
int i = 0; int i = 0;
*_pSession << "{? = call storedFunction()}", out(i), now; *_pSession << "{? = call storedFunction()}", out(i), now;
assertTrue (-1 == i); assertTrue (-1 == i);
dropObject("FUNCTION", "storedFunction"); dropObject("FUNCTION", "storedFunction");
*_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction(inParam IN NUMBER) RETURN NUMBER IS "
" BEGIN RETURN(inParam*inParam); "
" END storedFunction;" , now;
i = 2;
int result = 0;
*_pSession << "{? = call storedFunction(?)}", out(result), in(i), now;
assertTrue (4 == result);
dropObject("FUNCTION", "storedFunction");
*_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction(inParam IN NUMBER, outParam OUT NUMBER) RETURN NUMBER IS "
" BEGIN outParam := inParam*inParam; RETURN(outParam); "
" END storedFunction;" , now;
i = 2;
int j = 0;
result = 0;
*_pSession << "{? = call storedFunction(?, ?)}", out(result), in(i), out(j), now;
assertTrue (4 == j);
assertTrue (j == result);
dropObject("FUNCTION", "storedFunction");
*_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction(param1 IN OUT NUMBER, param2 IN OUT NUMBER) RETURN NUMBER IS "
" temp NUMBER := param1; "
" BEGIN param1 := param2; param2 := temp; RETURN(param1+param2); "
" END storedFunction;" , now;
i = 1;
j = 2;
result = 0;
*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now;
assertTrue (1 == j);
assertTrue (2 == i);
assertTrue (3 == result);
Tuple<int, int> params(1, 2);
assertTrue (1 == params.get<0>());
assertTrue (2 == params.get<1>());
result = 0;
*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(params), now;
assertTrue (1 == params.get<1>());
assertTrue (2 == params.get<0>());
assertTrue (3 == result);
dropObject("FUNCTION", "storedFunction");
k += 2;
}
session().setFeature("autoBind", true);
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction(inParam IN NUMBER) RETURN NUMBER IS " "FUNCTION storedFunction(inParam IN VARCHAR2, outParam OUT VARCHAR2) RETURN VARCHAR2 IS "
" BEGIN RETURN(inParam*inParam); " " BEGIN outParam := inParam; RETURN outParam;"
" END storedFunction;" , now; "END storedFunction;" , now;
i = 2; std::string inParam = "123";
int result = 0; std::string outParam;
*_pSession << "{? = call storedFunction(?)}", out(result), in(i), now; std::string ret;
assertTrue (4 == result); *_pSession << "{? = call storedFunction(?,?)}", out(ret), in(inParam), out(outParam), now;
assertTrue ("123" == inParam);
assertTrue (inParam == outParam);
assertTrue (ret == outParam);
dropObject("FUNCTION", "storedFunction"); dropObject("FUNCTION", "storedFunction");
*_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction(inParam IN NUMBER, outParam OUT NUMBER) RETURN NUMBER IS "
" BEGIN outParam := inParam*inParam; RETURN(outParam); "
" END storedFunction;" , now;
i = 2;
int j = 0;
result = 0;
*_pSession << "{? = call storedFunction(?, ?)}", out(result), in(i), out(j), now;
assertTrue (4 == j);
assertTrue (j == result);
dropObject("FUNCTION", "storedFunction");
*_pSession << "CREATE OR REPLACE "
"FUNCTION storedFunction(param1 IN OUT NUMBER, param2 IN OUT NUMBER) RETURN NUMBER IS "
" temp NUMBER := param1; "
" BEGIN param1 := param2; param2 := temp; RETURN(param1+param2); "
" END storedFunction;" , now;
i = 1;
j = 2;
result = 0;
*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now;
assertTrue (1 == j);
assertTrue (2 == i);
assertTrue (3 == result);
Tuple<int, int> params(1, 2);
assertTrue (1 == params.get<0>());
assertTrue (2 == params.get<1>());
result = 0;
*_pSession << "{? = call storedFunction(?, ?)}", out(result), io(params), now;
assertTrue (1 == params.get<1>());
assertTrue (2 == params.get<0>());
assertTrue (3 == result);
dropObject("FUNCTION", "storedFunction");
k += 2;
} }
catch(const DataException& e)
session().setFeature("autoBind", true); {
std::cerr << e.displayText() << '\n';
*_pSession << "CREATE OR REPLACE " fail ("testStoredFunction()", __LINE__, __FILE__);
"FUNCTION storedFunction(inParam IN VARCHAR2, outParam OUT VARCHAR2) RETURN VARCHAR2 IS " }
" BEGIN outParam := inParam; RETURN outParam;"
"END storedFunction;" , now;
std::string inParam = "123";
std::string outParam;
std::string ret;
*_pSession << "{? = call storedFunction(?,?)}", out(ret), in(inParam), out(outParam), now;
assertTrue ("123" == inParam);
assertTrue (inParam == outParam);
assertTrue (ret == outParam);
dropObject("PROCEDURE", "storedFunction");
} }
void ODBCOracleTest::testCursorStoredFunction() void ODBCOracleTest::testCursorStoredFunction()
{ {
for (int k = 0; k < 8;) try
{ {
session().setFeature("autoBind", bindValue(k)); for (int k = 0; k < 8;)
session().setFeature("autoExtract", bindValue(k+1)); {
session().setFeature("autoBind", bindValue(k));
session().setFeature("autoExtract", bindValue(k+1));
recreatePersonTable(); recreatePersonTable();
typedef Tuple<std::string, std::string, std::string, int> Person; typedef Tuple<std::string, std::string, std::string, int> Person;
std::vector<Person> people; std::vector<Person> people;
people.push_back(Person("Simpson", "Homer", "Springfield", 42)); people.push_back(Person("Simpson", "Homer", "Springfield", 42));
people.push_back(Person("Simpson", "Bart", "Springfield", 12)); people.push_back(Person("Simpson", "Bart", "Springfield", 12));
people.push_back(Person("Simpson", "Lisa", "Springfield", 10)); people.push_back(Person("Simpson", "Lisa", "Springfield", 10));
*_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now; *_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now;
*_pSession << "CREATE OR REPLACE " *_pSession << "CREATE OR REPLACE "
"FUNCTION storedCursorFunction(ageLimit IN NUMBER) RETURN SYS_REFCURSOR IS " "FUNCTION storedCursorFunction(ageLimit IN NUMBER) RETURN SYS_REFCURSOR IS "
" ret SYS_REFCURSOR; " " ret SYS_REFCURSOR; "
" BEGIN " " BEGIN "
" OPEN ret FOR " " OPEN ret FOR "
" SELECT * " " SELECT * "
" FROM Person " " FROM Person "
" WHERE Age < ageLimit " " WHERE Age < ageLimit "
" ORDER BY Age DESC; " " ORDER BY Age DESC; "
" RETURN ret; " " RETURN ret; "
" END storedCursorFunction;" , now; " END storedCursorFunction;" , now;
people.clear(); people.clear();
int age = 13; int age = 13;
*_pSession << "{call storedCursorFunction(?)}", in(age), into(people), now; *_pSession << "{call storedCursorFunction(?)}", in(age), into(people), now;
assertTrue (2 == people.size()); assertTrue (2 == people.size());
assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]); assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]);
assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]); assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]);
Statement stmt = ((*_pSession << "{call storedCursorFunction(?)}", in(age), now)); Statement stmt = ((*_pSession << "{call storedCursorFunction(?)}", in(age), now));
RecordSet rs(stmt); RecordSet rs(stmt);
assertTrue (rs["LastName"] == "Simpson"); assertTrue (rs["LastName"] == "Simpson");
assertTrue (rs["FirstName"] == "Bart"); assertTrue (rs["FirstName"] == "Bart");
assertTrue (rs["Address"] == "Springfield"); assertTrue (rs["Address"] == "Springfield");
assertTrue (rs["Age"] == 12); assertTrue (rs["Age"] == 12);
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
dropObject("FUNCTION", "storedCursorFunction"); dropObject("FUNCTION", "storedCursorFunction");
k += 2; k += 2;
}
}
catch(const DataException& e)
{
std::cerr << e.displayText() << '\n';
fail ("testCursorStoredFunction()", __LINE__, __FILE__);
} }
} }
@ -655,7 +712,7 @@ void ODBCOracleTest::dropObject(const std::string& type, const std::string& name
for (; it != flds.end(); ++it) for (; it != flds.end(); ++it)
{ {
if (4043 == it->_nativeError || //ORA-04043 (object does not exist) if (4043 == it->_nativeError || //ORA-04043 (object does not exist)
942 == it->_nativeError)//ORA-00942 (table does not exist) 942 == it->_nativeError || 1433808584/*DevArt*/== it->_nativeError) //ORA-00942 (table does not exist)
{ {
ignoreError = true; ignoreError = true;
break; break;
@ -671,8 +728,8 @@ void ODBCOracleTest::recreateNullableTable()
{ {
dropObject("TABLE", "NullableTest"); dropObject("TABLE", "NullableTest");
try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR2(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat NUMBER NULL , EmptyDateTime TIMESTAMP NULL)", now; } try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR2(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat NUMBER NULL , EmptyDateTime TIMESTAMP NULL)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()", __LINE__, __FILE__); }
} }
@ -680,8 +737,8 @@ void ODBCOracleTest::recreatePersonTable()
{ {
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
try { *_pSession << "CREATE TABLE Person (LastName VARCHAR2(30), FirstName VARCHAR2(30), Address VARCHAR2(30), Age INTEGER)", now; } try { *_pSession << "CREATE TABLE Person (LastName VARCHAR2(30), FirstName VARCHAR2(30), Address VARCHAR2(30), Age INTEGER)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()", __LINE__, __FILE__); }
} }
@ -690,8 +747,8 @@ void ODBCOracleTest::recreatePersonTupleTable()
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
try { *_pSession << "CREATE TABLE Person (LastName1 VARCHAR2(30), FirstName1 VARCHAR2(30), Address1 VARCHAR2(30), Age1 INTEGER," try { *_pSession << "CREATE TABLE Person (LastName1 VARCHAR2(30), FirstName1 VARCHAR2(30), Address1 VARCHAR2(30), Age1 INTEGER,"
"LastName2 VARCHAR2(30), FirstName2 VARCHAR2(30), Address2 VARCHAR2(30), Age2 INTEGER)", now; } "LastName2 VARCHAR2(30), FirstName2 VARCHAR2(30), Address2 VARCHAR2(30), Age2 INTEGER)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTupleTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTupleTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTupleTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTupleTable()", __LINE__, __FILE__); }
} }
@ -699,8 +756,8 @@ void ODBCOracleTest::recreatePersonBLOBTable()
{ {
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Image BLOB)", now; } try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Image BLOB)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonBLOBTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonBLOBTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonBLOBTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonBLOBTable()", __LINE__, __FILE__); }
} }
@ -708,8 +765,8 @@ void ODBCOracleTest::recreatePersonDateTimeTable()
{ {
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Born TIMESTAMP)", now; } try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Born TIMESTAMP)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTimeTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTimeTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTimeTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTimeTable()", __LINE__, __FILE__); }
} }
@ -717,8 +774,8 @@ void ODBCOracleTest::recreatePersonDateTable()
{ {
dropObject("TABLE", "Person"); dropObject("TABLE", "Person");
try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), BornDate DATE)", now; } try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), BornDate DATE)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTable()", __LINE__, __FILE__); }
} }
@ -726,8 +783,8 @@ void ODBCOracleTest::recreateIntsTable()
{ {
dropObject("TABLE", "Strings"); dropObject("TABLE", "Strings");
try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; } try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()", __LINE__, __FILE__); }
} }
@ -735,8 +792,8 @@ void ODBCOracleTest::recreateStringsTable()
{ {
dropObject("TABLE", "Strings"); dropObject("TABLE", "Strings");
try { *_pSession << "CREATE TABLE Strings (str VARCHAR(30))", now; } try { *_pSession << "CREATE TABLE Strings (str VARCHAR(30))", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateStringsTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateStringsTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateStringsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateStringsTable()", __LINE__, __FILE__); }
} }
@ -744,8 +801,8 @@ void ODBCOracleTest::recreateFloatsTable()
{ {
dropObject("TABLE", "Strings"); dropObject("TABLE", "Strings");
try { *_pSession << "CREATE TABLE Strings (str NUMBER)", now; } try { *_pSession << "CREATE TABLE Strings (str NUMBER)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateFloatsTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateFloatsTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateFloatsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateFloatsTable()", __LINE__, __FILE__); }
} }
@ -756,8 +813,8 @@ void ODBCOracleTest::recreateTuplesTable()
"(int0 INTEGER, int1 INTEGER, int2 INTEGER, int3 INTEGER, int4 INTEGER, int5 INTEGER, int6 INTEGER, " "(int0 INTEGER, int1 INTEGER, int2 INTEGER, int3 INTEGER, int4 INTEGER, int5 INTEGER, int6 INTEGER, "
"int7 INTEGER, int8 INTEGER, int9 INTEGER, int10 INTEGER, int11 INTEGER, int12 INTEGER, int13 INTEGER," "int7 INTEGER, int8 INTEGER, int9 INTEGER, int10 INTEGER, int11 INTEGER, int12 INTEGER, int13 INTEGER,"
"int14 INTEGER, int15 INTEGER, int16 INTEGER, int17 INTEGER, int18 INTEGER, int19 INTEGER)", now; } "int14 INTEGER, int15 INTEGER, int16 INTEGER, int17 INTEGER, int18 INTEGER, int19 INTEGER)", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateTuplesTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateTuplesTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateTuplesTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateTuplesTable()", __LINE__, __FILE__); }
} }
@ -765,8 +822,8 @@ void ODBCOracleTest::recreateVectorsTable()
{ {
dropObject("TABLE", "Vectors"); dropObject("TABLE", "Vectors");
try { *_pSession << "CREATE TABLE Vectors (int0 INTEGER, flt0 NUMBER(5,2), str0 VARCHAR(30))", now; } try { *_pSession << "CREATE TABLE Vectors (int0 INTEGER, flt0 NUMBER(5,2), str0 VARCHAR(30))", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateVectorsTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateVectorsTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateVectorsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateVectorsTable()", __LINE__, __FILE__); }
} }
@ -774,8 +831,8 @@ void ODBCOracleTest::recreateAnysTable()
{ {
dropObject("TABLE", "Anys"); dropObject("TABLE", "Anys");
try { *_pSession << "CREATE TABLE Anys (int0 INTEGER, flt0 NUMBER, str0 VARCHAR(30))", now; } try { *_pSession << "CREATE TABLE Anys (int0 INTEGER, flt0 NUMBER, str0 VARCHAR(30))", now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateAnysTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateAnysTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateAnysTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateAnysTable()", __LINE__, __FILE__); }
} }
@ -786,8 +843,8 @@ void ODBCOracleTest::recreateNullsTable(const std::string& notNull)
notNull, notNull,
notNull, notNull,
notNull), now; } notNull), now; }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateNullsTable()"); } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateNullsTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateNullsTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateNullsTable()", __LINE__, __FILE__); }
} }
@ -802,8 +859,8 @@ void ODBCOracleTest::recreateMiscTable()
"Third INTEGER," "Third INTEGER,"
"Fourth NUMBER," "Fourth NUMBER,"
"Fifth TIMESTAMP)", now; "Fifth TIMESTAMP)", now;
} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); } } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()", __LINE__, __FILE__); }
} }
@ -827,8 +884,8 @@ void ODBCOracleTest::recreateLogTable()
session() << sql, "T_POCO_LOG", now; session() << sql, "T_POCO_LOG", now;
session() << sql, "T_POCO_LOG_ARCHIVE", now; session() << sql, "T_POCO_LOG_ARCHIVE", now;
} catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); } } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()", __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()", __LINE__, __FILE__); }
} }
@ -914,23 +971,17 @@ CppUnit::Test* ODBCOracleTest::suite()
CppUnit_addTest(pSuite, ODBCOracleTest, testTuple); CppUnit_addTest(pSuite, ODBCOracleTest, testTuple);
CppUnit_addTest(pSuite, ODBCOracleTest, testTupleVector); CppUnit_addTest(pSuite, ODBCOracleTest, testTupleVector);
CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedure); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedure);
CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredProcedure); //CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredProcedure);
CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedureAny); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedureAny);
CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedureDynamicAny); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedureDynamicAny);
CppUnit_addTest(pSuite, ODBCOracleTest, testStoredFunction); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredFunction);
CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredFunction); //CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredFunction);
CppUnit_addTest(pSuite, ODBCOracleTest, testInternalExtraction); CppUnit_addTest(pSuite, ODBCOracleTest, testInternalExtraction);
CppUnit_addTest(pSuite, ODBCOracleTest, testFilter); CppUnit_addTest(pSuite, ODBCOracleTest, testFilter);
CppUnit_addTest(pSuite, ODBCOracleTest, testInternalBulkExtraction); CppUnit_addTest(pSuite, ODBCOracleTest, testInternalBulkExtraction);
CppUnit_addTest(pSuite, ODBCOracleTest, testInternalStorageType); CppUnit_addTest(pSuite, ODBCOracleTest, testInternalStorageType);
CppUnit_addTest(pSuite, ODBCOracleTest, testNull); CppUnit_addTest(pSuite, ODBCOracleTest, testNull);
CppUnit_addTest(pSuite, ODBCOracleTest, testRowIterator); CppUnit_addTest(pSuite, ODBCOracleTest, testRowIterator);
CppUnit_addTest(pSuite, ODBCOracleTest, testAsync);
CppUnit_addTest(pSuite, ODBCOracleTest, testAny);
CppUnit_addTest(pSuite, ODBCOracleTest, testDynamicAny);
CppUnit_addTest(pSuite, ODBCOracleTest, testMultipleResults);
CppUnit_addTest(pSuite, ODBCOracleTest, testSQLChannel);
CppUnit_addTest(pSuite, ODBCOracleTest, testSQLLogger);
CppUnit_addTest(pSuite, ODBCOracleTest, testAutoCommit); CppUnit_addTest(pSuite, ODBCOracleTest, testAutoCommit);
CppUnit_addTest(pSuite, ODBCOracleTest, testSessionTransactionNoAutoCommit); CppUnit_addTest(pSuite, ODBCOracleTest, testSessionTransactionNoAutoCommit);
CppUnit_addTest(pSuite, ODBCOracleTest, testTransactionIsolation); CppUnit_addTest(pSuite, ODBCOracleTest, testTransactionIsolation);

View File

@ -38,6 +38,8 @@ public:
void testMultipleResults(); void testMultipleResults();
virtual void testTransaction();
void testStoredProcedure(); void testStoredProcedure();
void testCursorStoredProcedure(); void testCursorStoredProcedure();
void testStoredFunction(); void testStoredFunction();

View File

@ -224,7 +224,7 @@ void ODBCSQLServerTest::testNull()
recreateNullsTable("NOT NULL"); recreateNullsTable("NOT NULL");
session().setFeature("autoBind", bindValue(i)); session().setFeature("autoBind", bindValue(i));
session().setFeature("autoExtract", bindValue(i+1)); session().setFeature("autoExtract", bindValue(i+1));
executor().notNulls("23000"); executor().notNulls({"23000"});
i += 2; i += 2;
} }

View File

@ -130,7 +130,7 @@ void ODBCSQLiteTest::testNull()
recreateNullsTable("NOT NULL"); recreateNullsTable("NOT NULL");
session().setFeature("autoBind", bindValue(i)); session().setFeature("autoBind", bindValue(i));
session().setFeature("autoExtract", bindValue(i+1)); session().setFeature("autoExtract", bindValue(i+1));
_pExecutor->notNulls("HY000"); _pExecutor->notNulls({"HY000"});
i += 2; i += 2;
} }
} }

View File

@ -1275,7 +1275,7 @@ void ODBCTest::testTransaction()
recreatePersonTable(); recreatePersonTable();
_pSession->setFeature("autoBind", bindValue(i)); _pSession->setFeature("autoBind", bindValue(i));
_pSession->setFeature("autoExtract", bindValue(i+1)); _pSession->setFeature("autoExtract", bindValue(i+1));
_pExecutor->transaction(_rConnectString); _pExecutor->transaction(_rConnectString, _readUncommitted);
i += 2; i += 2;
} }
} }

View File

@ -210,6 +210,8 @@ protected:
Poco::Data::Session& session(); Poco::Data::Session& session();
SQLExecutor& executor(); SQLExecutor& executor();
void setReadUncommitted(bool val);
const std::string& dsn(); const std::string& dsn();
const std::string& uid(); const std::string& uid();
const std::string& pwd(); const std::string& pwd();
@ -224,6 +226,7 @@ private:
std::string& _rUID; std::string& _rUID;
std::string& _rPwd; std::string& _rPwd;
std::string& _rConnectString; std::string& _rConnectString;
bool _readUncommitted = true;
}; };
@ -443,4 +446,10 @@ inline const std::string& ODBCTest::dbConnString()
} }
inline void ODBCTest::setReadUncommitted(bool val)
{
_readUncommitted = val;
}
#endif // ODBCTest_INCLUDED #endif // ODBCTest_INCLUDED

View File

@ -579,7 +579,8 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
SQLExecutor::DataBinding bindMode, SQLExecutor::DataBinding bindMode,
SQLExecutor::DataExtraction extractMode, SQLExecutor::DataExtraction extractMode,
const std::string& insert, const std::string& insert,
const std::string& select) const std::string& select,
const std::string& procCreateString)
{ {
SQLRETURN rc; SQLRETURN rc;
SQLHENV henv = SQL_NULL_HENV; SQLHENV henv = SQL_NULL_HENV;
@ -626,6 +627,18 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString,
rc = SQLExecute(hstmt); rc = SQLExecute(hstmt);
poco_odbc_check_stmt (rc, hstmt); poco_odbc_check_stmt (rc, hstmt);
// create stored proc, if provided
if (!procCreateString.empty())
{
sql = procCreateString;
pStr = (SQLCHAR*) sql.c_str();
rc = SQLPrepare(hstmt, pStr, (SQLINTEGER) sql.length());
poco_odbc_check_stmt (rc, hstmt);
rc = SQLExecute(hstmt);
poco_odbc_check_stmt (rc, hstmt);
}
// insert multiple rows // insert multiple rows
pStr = (SQLCHAR*) insert.c_str(); pStr = (SQLCHAR*) insert.c_str();
rc = SQLPrepare(hstmt, pStr, (SQLINTEGER) insert.length()); rc = SQLPrepare(hstmt, pStr, (SQLINTEGER) insert.length());
@ -980,8 +993,12 @@ void SQLExecutor::execute(const std::string& sql)
void SQLExecutor::connection(const std::string& connectString) void SQLExecutor::connection(const std::string& connectString)
{ {
std::cout << connectString << std::endl;
Poco::Data::ODBC::Connection c; Poco::Data::ODBC::Connection c;
_dataExecutor.connection(c, connectString); try { _dataExecutor.connection(c, connectString); }
catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (connectString, __LINE__, __FILE__); }
catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (connectString, __LINE__, __FILE__); }
catch(Poco::Exception& se){ std::cout << se.displayText() << std::endl; fail (connectString, __LINE__, __FILE__); }
} }
@ -1025,7 +1042,7 @@ void SQLExecutor::session(const std::string& connectString, int timeout)
} }
void SQLExecutor::notNulls(const std::string& sqlState) void SQLExecutor::notNulls(const std::vector<std::string>& sqlStates)
{ {
try try
{ {
@ -1038,9 +1055,14 @@ void SQLExecutor::notNulls(const std::string& sqlState)
if (se.diagnostics().fields().size()) if (se.diagnostics().fields().size())
{ {
std::string st = se.diagnostics().sqlState(0); std::string st = se.diagnostics().sqlState(0);
if (sqlState != st) for (const auto& sqlState : sqlStates)
std::cerr << '[' << name() << ']' << " Warning: expected SQL state [" << sqlState << if (sqlState == st) return;
"], received [" << se.diagnostics().sqlState(0) << "] instead." << std::endl;
std::string strSQLStates;
for (const auto& sqlState : sqlStates)
strSQLStates.append(sqlState).append(1, ' ');
std::cerr << '[' << name() << ']' << " Warning: expected SQL state [" << strSQLStates <<
"], received [" << st << "] instead." << std::endl;
} }
} }
} }

View File

@ -106,7 +106,8 @@ public:
SQLExecutor::DataBinding bindMode, SQLExecutor::DataBinding bindMode,
SQLExecutor::DataExtraction extractMode, SQLExecutor::DataExtraction extractMode,
const std::string& insert = MULTI_INSERT, const std::string& insert = MULTI_INSERT,
const std::string& select = MULTI_SELECT); const std::string& select = MULTI_SELECT,
const std::string& procCreateString = "");
void bareboneODBCStoredFuncTest(const std::string& dbConnString, void bareboneODBCStoredFuncTest(const std::string& dbConnString,
const std::string& tableCreateString, const std::string& tableCreateString,
@ -495,7 +496,7 @@ public:
void internalBulkExtractionUTF16(); void internalBulkExtractionUTF16();
void internalStorageType(); void internalStorageType();
void nulls(); void nulls();
void notNulls(const std::string& sqlState = "23502"); void notNulls(const std::vector<std::string>& sqlStates = {std::string("23502")});
void rowIterator(); void rowIterator();
void stdVectorBool(); void stdVectorBool();
@ -517,7 +518,7 @@ public:
void sessionTransaction(const std::string& connect); void sessionTransaction(const std::string& connect);
void sessionTransactionNoAutoCommit(const std::string& connect); void sessionTransactionNoAutoCommit(const std::string& connect);
void transaction(const std::string& connect); void transaction(const std::string& connect, bool readUncommitted = true);
void transactor(); void transactor();
void nullable(); void nullable();
@ -994,9 +995,9 @@ inline void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& conne
} }
inline void SQLExecutor::transaction(const std::string& connect) inline void SQLExecutor::transaction(const std::string& connect, bool readUncommitted)
{ {
_dataExecutor.transaction("odbc", connect); _dataExecutor.transaction("odbc", connect, readUncommitted);
} }

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataPostgreSQLA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataPostgreSQLA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataPostgreSQLmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataPostgreSQLmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataPostgreSQLmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataPostgreSQLmtd</TargetName>
@ -346,6 +346,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\binA64\PocoDataPostgreSQLA64d.dll</OutputFile> <OutputFile>..\..\binA64\PocoDataPostgreSQLA64d.dll</OutputFile>
@ -379,6 +381,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\binA64\PocoDataPostgreSQLA64.dll</OutputFile> <OutputFile>..\..\binA64\PocoDataPostgreSQLA64.dll</OutputFile>
@ -410,6 +414,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataPostgreSQLmtd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataPostgreSQLmtd.lib</OutputFile>
@ -436,6 +442,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataPostgreSQLmt.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataPostgreSQLmt.lib</OutputFile>
@ -459,6 +467,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataPostgreSQLmdd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataPostgreSQLmdd.lib</OutputFile>
@ -485,6 +495,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataPostgreSQLmd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataPostgreSQLmd.lib</OutputFile>
@ -508,6 +520,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin\PocoDataPostgreSQLd.dll</OutputFile> <OutputFile>..\..\bin\PocoDataPostgreSQLd.dll</OutputFile>
@ -541,6 +555,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin\PocoDataPostgreSQL.dll</OutputFile> <OutputFile>..\..\bin\PocoDataPostgreSQL.dll</OutputFile>
@ -572,6 +588,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataPostgreSQLmtd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataPostgreSQLmtd.lib</OutputFile>
@ -598,6 +616,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataPostgreSQLmt.lib</OutputFile> <OutputFile>..\..\lib\PocoDataPostgreSQLmt.lib</OutputFile>
@ -621,6 +641,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataPostgreSQLmdd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataPostgreSQLmdd.lib</OutputFile>
@ -647,6 +669,8 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataPostgreSQLmd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataPostgreSQLmd.lib</OutputFile>
@ -670,6 +694,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin64\PocoDataPostgreSQL64d.dll</OutputFile> <OutputFile>..\..\bin64\PocoDataPostgreSQL64d.dll</OutputFile>
@ -703,6 +729,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin64\PocoDataPostgreSQL64.dll</OutputFile> <OutputFile>..\..\bin64\PocoDataPostgreSQL64.dll</OutputFile>
@ -734,6 +762,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataPostgreSQLmtd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataPostgreSQLmtd.lib</OutputFile>
@ -760,6 +790,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataPostgreSQLmt.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataPostgreSQLmt.lib</OutputFile>
@ -783,6 +815,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataPostgreSQLmdd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataPostgreSQLmdd.lib</OutputFile>
@ -809,6 +843,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataPostgreSQLmd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataPostgreSQLmd.lib</OutputFile>
@ -817,36 +853,58 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\BinaryExtractor.cpp"> <ClCompile Include="src\BinaryExtractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Binder.cpp"> <ClCompile Include="src\Binder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Connector.cpp"> <ClCompile Include="src\Connector.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Extractor.cpp"> <ClCompile Include="src\Extractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\PostgreSQLException.cpp"> <ClCompile Include="src\PostgreSQLException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\PostgreSQLStatementImpl.cpp"> <ClCompile Include="src\PostgreSQLStatementImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\PostgreSQLTypes.cpp"> <ClCompile Include="src\PostgreSQLTypes.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionHandle.cpp"> <ClCompile Include="src\SessionHandle.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionImpl.cpp"> <ClCompile Include="src\SessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\StatementExecutor.cpp"> <ClCompile Include="src\StatementExecutor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Utility.cpp"> <ClCompile Include="src\Utility.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataSQLiteA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataSQLiteA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataSQLitemdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataSQLitemdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataSQLitemtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataSQLitemtd</TargetName>
@ -347,6 +347,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\binA64\PocoDataSQLiteA64d.dll</OutputFile> <OutputFile>..\..\binA64\PocoDataSQLiteA64d.dll</OutputFile>
@ -381,6 +383,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\binA64\PocoDataSQLiteA64.dll</OutputFile> <OutputFile>..\..\binA64\PocoDataSQLiteA64.dll</OutputFile>
@ -413,6 +417,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataSQLitemtd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataSQLitemtd.lib</OutputFile>
@ -440,6 +446,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataSQLitemt.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataSQLitemt.lib</OutputFile>
@ -464,6 +472,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataSQLitemdd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataSQLitemdd.lib</OutputFile>
@ -491,6 +501,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\libA64\PocoDataSQLitemd.lib</OutputFile> <OutputFile>..\..\libA64\PocoDataSQLitemd.lib</OutputFile>
@ -515,6 +527,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin\PocoDataSQLited.dll</OutputFile> <OutputFile>..\..\bin\PocoDataSQLited.dll</OutputFile>
@ -549,6 +563,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin\PocoDataSQLite.dll</OutputFile> <OutputFile>..\..\bin\PocoDataSQLite.dll</OutputFile>
@ -581,6 +597,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataSQLitemtd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataSQLitemtd.lib</OutputFile>
@ -608,6 +626,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataSQLitemt.lib</OutputFile> <OutputFile>..\..\lib\PocoDataSQLitemt.lib</OutputFile>
@ -632,6 +652,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataSQLitemdd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataSQLitemdd.lib</OutputFile>
@ -659,6 +681,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib\PocoDataSQLitemd.lib</OutputFile> <OutputFile>..\..\lib\PocoDataSQLitemd.lib</OutputFile>
@ -683,6 +707,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin64\PocoDataSQLite64d.dll</OutputFile> <OutputFile>..\..\bin64\PocoDataSQLite64d.dll</OutputFile>
@ -717,6 +743,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\bin64\PocoDataSQLite64.dll</OutputFile> <OutputFile>..\..\bin64\PocoDataSQLite64.dll</OutputFile>
@ -749,6 +777,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataSQLitemtd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataSQLitemtd.lib</OutputFile>
@ -776,6 +806,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataSQLitemt.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataSQLitemt.lib</OutputFile>
@ -800,6 +832,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataSQLitemdd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataSQLitemdd.lib</OutputFile>
@ -827,6 +861,8 @@
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\lib64\PocoDataSQLitemd.lib</OutputFile> <OutputFile>..\..\lib64\PocoDataSQLitemd.lib</OutputFile>
@ -847,30 +883,48 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Binder.cpp"> <ClCompile Include="src\Binder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Connector.cpp"> <ClCompile Include="src\Connector.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Extractor.cpp"> <ClCompile Include="src\Extractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Notifier.cpp"> <ClCompile Include="src\Notifier.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionImpl.cpp"> <ClCompile Include="src\SessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\sqlite3.c"> <ClCompile Include="src\sqlite3.c">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLiteException.cpp"> <ClCompile Include="src\SQLiteException.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLiteStatementImpl.cpp"> <ClCompile Include="src\SQLiteStatementImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Utility.cpp"> <ClCompile Include="src\Utility.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,22 +2,22 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="SQLite"> <Filter Include="SQLite">
<UniqueIdentifier>{023fba4b-4ebd-4098-bfd0-95569b89efb9}</UniqueIdentifier> <UniqueIdentifier>{1bad0647-a4aa-4822-a8ea-93f788ff7be1}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLite\Header Files"> <Filter Include="SQLite\Header Files">
<UniqueIdentifier>{9a59ce73-0d00-4438-9ea1-9014d62bf834}</UniqueIdentifier> <UniqueIdentifier>{b81dd631-b740-450c-8fda-ba9c8d87c466}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLite\Source Files"> <Filter Include="SQLite\Source Files">
<UniqueIdentifier>{2a5c5030-0ab3-4ac1-8699-3cc1d228047b}</UniqueIdentifier> <UniqueIdentifier>{d8fc7394-be23-4595-962f-53b9acdda727}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="3rdparty"> <Filter Include="3rdparty">
<UniqueIdentifier>{34f21c3d-d771-458f-9b6f-90a3a44bb448}</UniqueIdentifier> <UniqueIdentifier>{52dda208-a7cf-4967-a74f-88b1e0e30026}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="3rdparty\Header Files"> <Filter Include="3rdparty\Header Files">
<UniqueIdentifier>{67a323f5-6b84-4db0-9098-087855fe9ac2}</UniqueIdentifier> <UniqueIdentifier>{f8e8c0dd-45d7-4f06-8814-ccec0b5d03c6}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="3rdparty\Source Files"> <Filter Include="3rdparty\Source Files">
<UniqueIdentifier>{aa7d787e-3b84-43df-9232-8e399089ee3e}</UniqueIdentifier> <UniqueIdentifier>{4aa8c8c7-825e-46aa-8e36-59985cef50b2}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -914,12 +950,18 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Driver.cpp"> <ClCompile Include="src\Driver.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLiteTest.cpp"> <ClCompile Include="src\SQLiteTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLiteTestSuite.cpp"> <ClCompile Include="src\SQLiteTestSuite.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,28 +2,28 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="SQLite"> <Filter Include="SQLite">
<UniqueIdentifier>{dd4cfc76-874b-4382-be44-81a295298cb6}</UniqueIdentifier> <UniqueIdentifier>{62bc9434-578c-424b-af4b-838e351397f5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLite\Header Files"> <Filter Include="SQLite\Header Files">
<UniqueIdentifier>{c5923469-368d-4bcb-8f28-5705b18b49c9}</UniqueIdentifier> <UniqueIdentifier>{d11aa317-b999-454c-84af-0caae02b36f8}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLite\Source Files"> <Filter Include="SQLite\Source Files">
<UniqueIdentifier>{51dcfbe6-d547-4150-a965-ed9d7f75e266}</UniqueIdentifier> <UniqueIdentifier>{de477f36-0385-4527-afe6-2c344f867014}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite"> <Filter Include="_Suite">
<UniqueIdentifier>{8b666d33-bda1-420e-b882-4b339c8f2214}</UniqueIdentifier> <UniqueIdentifier>{8f537ccd-f8fc-4079-8c37-5f0ac2c26436}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite\Header Files"> <Filter Include="_Suite\Header Files">
<UniqueIdentifier>{3e7c0757-51e8-47bc-a907-20f1e465474d}</UniqueIdentifier> <UniqueIdentifier>{836839b8-70df-4bf6-9130-447077a74d5c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite\Source Files"> <Filter Include="_Suite\Source Files">
<UniqueIdentifier>{0936e3ec-1613-4a78-ba4d-7f8ea3525526}</UniqueIdentifier> <UniqueIdentifier>{c4807f6c-ac72-45f0-9230-4181bb2da4b5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Driver"> <Filter Include="_Driver">
<UniqueIdentifier>{c40d7bc0-a933-4bd2-9e18-f53925bbbb40}</UniqueIdentifier> <UniqueIdentifier>{0503a1f8-53ab-4ddd-920c-bd3770f0b307}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Driver\Source Files"> <Filter Include="_Driver\Source Files">
<UniqueIdentifier>{018c2803-1962-4f36-9e10-4e1ea6e9afad}</UniqueIdentifier> <UniqueIdentifier>{6228e845-e29c-44cd-9347-0314b081373d}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -151,6 +151,25 @@ public:
/// - string is empty /// - string is empty
/// - getEmptyStringIsNull() returns true /// - getEmptyStringIsNull() returns true
std::string getHeldType() const
/// Returns the held type name, if set.
/// If held type name is not set, returns empty string.
/// Held type is optionally set by calling setHeldType<T>()
/// in child classes.
/// Useful for dynamic_cast failure diagnostics.
{
std::string held;
if (_pHeldType) held = *_pHeldType;
return held;
}
protected:
template<typename T>
void setHeldType()
{
_pHeldType.reset(new std::string(Poco::demangle<T>()));
}
private: private:
template <typename S> template <typename S>
bool isStringNull(const S& str, bool deflt) bool isStringNull(const S& str, bool deflt)
@ -169,6 +188,7 @@ private:
bool _bulk; bool _bulk;
bool _emptyStringIsNull; bool _emptyStringIsNull;
bool _forceEmptyString; bool _forceEmptyString;
std::unique_ptr<std::string> _pHeldType;
}; };

View File

@ -492,10 +492,10 @@ private:
template <class C> template <class C>
class InternalExtraction: public Extraction<C> class InternalExtraction: public Extraction<C>
/// Container Data Type specialization extension for extraction of values from a query result set. /// Container Data Type extension for extraction of values from a query result set.
/// ///
/// This class is intended for PocoData internal use - it is used by StatementImpl /// This class is intended for PocoData internal use - it is used by StatementImpl
/// to automaticaly create internal Extraction in cases when statement returns data and no external storage /// to automatically create internal Extraction in cases when statement returns data and no external storage
/// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution. /// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution.
/// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn /// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn
/// owns the data container pointer. /// owns the data container pointer.
@ -503,17 +503,14 @@ class InternalExtraction: public Extraction<C>
/// InternalExtraction objects can not be copied or assigned. /// InternalExtraction objects can not be copied or assigned.
{ {
public: public:
using ValType = typename C::value_type; using HeldValType = typename C::value_type;
using ValPtr = SharedPtr<ValType>;
using Type = Extraction<ValType>;
using Ptr = SharedPtr<Type>;
InternalExtraction(C& result, Column<C>* pColumn, const Position& pos = Position(0)): InternalExtraction(C& result, Column<C>* pColumn, const Position& pos = Position(0)):
Extraction<C>(result, ValType(), pos), Extraction<C>(result, HeldValType(), pos),
_pColumn(pColumn) _pColumn(pColumn)
/// Creates InternalExtraction. /// Creates InternalExtraction.
{ {
AbstractExtraction::setHeldType<C>();
} }
~InternalExtraction() ~InternalExtraction()
@ -528,7 +525,7 @@ public:
_pColumn->reset(); _pColumn->reset();
} }
const ValType& value(int index) const const HeldValType& value(int index) const
{ {
try try
{ {

View File

@ -377,27 +377,22 @@ private:
const Column<C>& columnImpl(std::size_t pos) const const Column<C>& columnImpl(std::size_t pos) const
/// Returns the reference to column at specified position. /// Returns the reference to column at specified position.
{ {
using T = typename C::value_type;
using ExtractionVecPtr = const E*;
const AbstractExtractionVec& rExtractions = extractions(); const AbstractExtractionVec& rExtractions = extractions();
std::size_t s = rExtractions.size(); std::size_t s = rExtractions.size();
if (0 == s || pos >= s) if (0 == s || pos >= s)
throw RangeException(Poco::format("Invalid column index: %z", pos)); throw RangeException(Poco::format("Invalid column index: %z", pos));
ExtractionVecPtr pExtraction = dynamic_cast<ExtractionVecPtr>(rExtractions[pos].get()); auto pExtraction = rExtractions[pos].cast<E>();
if (!pExtraction)
if (pExtraction)
{ {
return pExtraction->column(); throw Poco::BadCastException(Poco::format("Type dynamic cast failed!\n"
} "Column: %z\nConversion:\n%s\n%s",
else
{
throw Poco::BadCastException(Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s",
pos, pos,
std::string(typeid(T).name()))); Poco::demangle(typeid(typename E::ValType).name()),
rExtractions[pos]->getHeldType()));
} }
return pExtraction->column();
} }
bool isAllowed(std::size_t row) const; bool isAllowed(std::size_t row) const;

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">Bindingd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">Bindingd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">Bindingd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">Bindingd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">Bindingd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">Bindingd</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,6 +946,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Binding.cpp"> <ClCompile Include="src\Binding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{e8e76134-6346-40e9-bce4-baf24c7610fb}</UniqueIdentifier> <UniqueIdentifier>{b66be61f-2d0d-4620-9e29-36518c68c8bc}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{9a993148-b7f8-48c8-92b8-14a209548407}</UniqueIdentifier> <UniqueIdentifier>{65592551-377e-432a-9257-638f138d095e}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">RecordSetd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">RecordSetd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">RecordSetd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">RecordSetd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">RecordSetd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">RecordSetd</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,6 +946,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\RecordSet.cpp"> <ClCompile Include="src\RecordSet.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{5c9585a2-5f0e-4e0d-a215-c5b4e2598b02}</UniqueIdentifier> <UniqueIdentifier>{96e43d12-7f78-4b66-a8b9-c83d2ef4822d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{4114cf23-5bc2-4f39-83cd-dab67726573b}</UniqueIdentifier> <UniqueIdentifier>{ed7a2499-d73a-4049-9ea4-5c4a6219b25f}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">RowFormatterd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">RowFormatterd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">RowFormatterd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">RowFormatterd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">RowFormatterd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">RowFormatterd</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,6 +946,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\RowFormatter.cpp"> <ClCompile Include="src\RowFormatter.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{55d27c6d-34e3-48c9-9dab-30f19b4eb2db}</UniqueIdentifier> <UniqueIdentifier>{abbe8f59-688c-4083-bb17-30afaf3b4078}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{a2662e75-309d-48b4-ac0f-6b20f70c63e7}</UniqueIdentifier> <UniqueIdentifier>{b1637afe-a5e1-4f7a-99c0-6b7a5c67fe2e}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">Tupled</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">Tupled</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">Tupled</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">Tupled</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">Tupled</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">Tupled</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,6 +946,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Tuple.cpp"> <ClCompile Include="src\Tuple.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{dac0e7cb-b6c6-48ec-a4fe-dfc68586a8a8}</UniqueIdentifier> <UniqueIdentifier>{3fa1093b-2e2f-48d3-91bc-1faed241dfe1}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{d0910af4-6934-4679-a1d5-06b32761ccbb}</UniqueIdentifier> <UniqueIdentifier>{89e9f080-6f25-42e9-bce1-121f839d2d69}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TypeHandlerd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TypeHandlerd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TypeHandlerd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TypeHandlerd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TypeHandlerd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TypeHandlerd</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,6 +946,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\TypeHandler.cpp"> <ClCompile Include="src\TypeHandler.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{c8572373-9da3-41da-ae2d-593a2d477636}</UniqueIdentifier> <UniqueIdentifier>{2080fcd4-75d2-47d1-8901-b6e36837010c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{c2309f1a-6646-481b-9043-eff95df10be7}</UniqueIdentifier> <UniqueIdentifier>{7dd4895e-fb1b-409c-a507-df11d3dabf37}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">WebNotifierd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">WebNotifierd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">WebNotifierd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">WebNotifierd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">WebNotifierd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">WebNotifierd</TargetName>
@ -358,6 +358,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,6 +393,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -421,6 +425,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -454,6 +460,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -484,6 +492,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -517,6 +527,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -547,6 +559,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -580,6 +594,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -610,6 +626,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -643,6 +661,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -673,6 +693,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -706,6 +728,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -736,6 +760,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -769,6 +795,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -799,6 +827,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,6 +862,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -862,6 +894,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -895,6 +929,8 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -910,6 +946,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\WebNotifier.cpp"> <ClCompile Include="src\WebNotifier.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{574dcbbb-642e-4307-b0da-189fb24bc04d}</UniqueIdentifier> <UniqueIdentifier>{a0e05d21-ad87-4322-8c68-d9cfb15cbd85}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{a73ef0f0-269a-4ac8-9988-d72517e63f55}</UniqueIdentifier> <UniqueIdentifier>{265b8749-8202-4f8e-be5b-46ba0e742cb5}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -16,5 +16,5 @@ vc.project.compiler.defines =
vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_EXPORTS vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_EXPORTS
vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.solution.create = false vc.solution.create = false

View File

@ -158,7 +158,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataTestd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataTestd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataTestmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataTestmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataTestmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataTestmtd</TargetName>
@ -240,7 +240,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Link> <Link>
@ -273,7 +273,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Link> <Link>
@ -305,7 +305,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -331,7 +331,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -355,7 +355,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -382,7 +382,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -405,7 +405,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Link> <Link>
@ -438,7 +438,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Link> <Link>
@ -470,7 +470,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -496,7 +496,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -520,7 +520,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>
@ -546,7 +546,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
<Lib> <Lib>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{500cef7c-16d5-46fb-97ec-01057efdb45c}</UniqueIdentifier> <UniqueIdentifier>{f760d849-e52d-44e3-84ac-c11bf255e05a}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{ea370452-c471-484e-953b-6d4f1802114c}</UniqueIdentifier> <UniqueIdentifier>{3abd9539-27ca-465e-bab6-f75ab22329ae}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataTestA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoDataTestA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataTestmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoDataTestmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataTestmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoDataTestmtd</TargetName>
@ -345,8 +345,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\..\binA64\PocoDataTestA64d.dll</OutputFile> <OutputFile>..\..\..\binA64\PocoDataTestA64d.dll</OutputFile>
@ -379,8 +381,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\..\binA64\PocoDataTestA64.dll</OutputFile> <OutputFile>..\..\..\binA64\PocoDataTestA64.dll</OutputFile>
@ -411,8 +415,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\libA64\PocoDataTestmtd.lib</OutputFile> <OutputFile>..\..\..\libA64\PocoDataTestmtd.lib</OutputFile>
@ -438,8 +444,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\libA64\PocoDataTestmt.lib</OutputFile> <OutputFile>..\..\..\libA64\PocoDataTestmt.lib</OutputFile>
@ -462,8 +470,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\libA64\PocoDataTestmdd.lib</OutputFile> <OutputFile>..\..\..\libA64\PocoDataTestmdd.lib</OutputFile>
@ -489,8 +499,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\libA64\PocoDataTestmd.lib</OutputFile> <OutputFile>..\..\..\libA64\PocoDataTestmd.lib</OutputFile>
@ -513,8 +525,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\..\bin\PocoDataTestd.dll</OutputFile> <OutputFile>..\..\..\bin\PocoDataTestd.dll</OutputFile>
@ -547,8 +561,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\..\bin\PocoDataTest.dll</OutputFile> <OutputFile>..\..\..\bin\PocoDataTest.dll</OutputFile>
@ -579,8 +595,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib\PocoDataTestmtd.lib</OutputFile> <OutputFile>..\..\..\lib\PocoDataTestmtd.lib</OutputFile>
@ -606,8 +624,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib\PocoDataTestmt.lib</OutputFile> <OutputFile>..\..\..\lib\PocoDataTestmt.lib</OutputFile>
@ -630,8 +650,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib\PocoDataTestmdd.lib</OutputFile> <OutputFile>..\..\..\lib\PocoDataTestmdd.lib</OutputFile>
@ -657,8 +679,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib\PocoDataTestmd.lib</OutputFile> <OutputFile>..\..\..\lib\PocoDataTestmd.lib</OutputFile>
@ -681,8 +705,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\..\bin64\PocoDataTest64d.dll</OutputFile> <OutputFile>..\..\..\bin64\PocoDataTest64d.dll</OutputFile>
@ -715,8 +741,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\..\..\bin64\PocoDataTest64.dll</OutputFile> <OutputFile>..\..\..\bin64\PocoDataTest64.dll</OutputFile>
@ -747,8 +775,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib64\PocoDataTestmtd.lib</OutputFile> <OutputFile>..\..\..\lib64\PocoDataTestmtd.lib</OutputFile>
@ -774,8 +804,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib64\PocoDataTestmt.lib</OutputFile> <OutputFile>..\..\..\lib64\PocoDataTestmt.lib</OutputFile>
@ -798,8 +830,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib64\PocoDataTestmdd.lib</OutputFile> <OutputFile>..\..\..\lib64\PocoDataTestmdd.lib</OutputFile>
@ -825,8 +859,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\..\..\lib64\PocoDataTestmd.lib</OutputFile> <OutputFile>..\..\..\lib64\PocoDataTestmd.lib</OutputFile>
@ -842,6 +878,8 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\SQLExecutor.cpp"> <ClCompile Include="src\SQLExecutor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{2713314a-e003-4c79-92c3-7d9b8e7203f9}</UniqueIdentifier> <UniqueIdentifier>{6dd648e2-e024-4d90-a270-c8ba55e39c02}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{de6b2c36-307e-4d6c-8e6d-d945183e3f0c}</UniqueIdentifier> <UniqueIdentifier>{69ef55f2-d63a-4a3b-841b-aaed5af20d13}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -61,11 +61,63 @@ public:
void connection(C& c, const std::string& connectString) void connection(C& c, const std::string& connectString)
{ {
assertFalse (c.isConnected()); assertFalse (c.isConnected());
assertTrue (c.connect(connectString, 5)); // some drivers/DBMS do not distinguish, so we only test same values here
assertTrue (c.connect(connectString, 10, 10));
assertTrue (c.isConnected()); assertTrue (c.isConnected());
assertTrue (c.getTimeout() == 5); try
c.setTimeout(6); {
assertTrue (c.getTimeout() == 6); assertTrue (c.getTimeout() == 10);
}
catch(const NotSupportedException&)
{
std::cout << "Getting session timeout not supported." << '\n';
}
try
{
assertTrue (c.getLoginTimeout() == 10);
}
catch(const NotSupportedException&)
{
std::cout << "Getting login timeout not supported." << '\n';
}
try
{
c.setTimeout(6);
}
catch(const NotSupportedException&)
{
std::cout << "Setting session timeout not supported." << '\n';
}
try
{
assertTrue (c.getTimeout() == 6);
}
catch(const NotSupportedException&)
{
std::cout << "Getting session timeout not supported." << '\n';
}
try
{
c.setLoginTimeout(11);
}
catch(const InvalidAccessException&)
{
std::cout << "Setting login timeout not supported." << '\n';
}
try
{
assertTrue (c.getLoginTimeout() == 11);
}
catch(const NotSupportedException&)
{
std::cout << "Getting login timeout not supported." << '\n';
}
assertTrue (c.disconnect()); assertTrue (c.disconnect());
assertFalse (c.isConnected()); assertFalse (c.isConnected());
assertTrue (c.connect(connectString)); assertTrue (c.connect(connectString));
@ -215,7 +267,7 @@ public:
void sessionTransaction(const std::string& connector, const std::string& connect); void sessionTransaction(const std::string& connector, const std::string& connect);
void sessionTransactionNoAutoCommit(const std::string& connector, const std::string& connect); void sessionTransactionNoAutoCommit(const std::string& connector, const std::string& connect);
void transaction(const std::string& connector, const std::string& connect); void transaction(const std::string& connector, const std::string& connect, bool readUncommitted = true);
void transactor(); void transactor();
void nullable(); void nullable();

View File

@ -573,7 +573,6 @@ void SQLExecutor::simpleAccess()
fail (__func__, __LINE__, __FILE__); fail (__func__, __LINE__, __FILE__);
} }
count = 0; count = 0;
try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } try { session() << "SELECT COUNT(*) FROM Person", into(count), now; }
catch(DataException& ce) catch(DataException& ce)
@ -2844,14 +2843,30 @@ void SQLExecutor::internalExtraction()
assertTrue (3 == rset2.columnCount()); assertTrue (3 == rset2.columnCount());
assertTrue (4 == rset2.rowCount()); assertTrue (4 == rset2.rowCount());
int i = rset.value<int>(0,0); try
assertTrue (1 == i); {
int i = rset.value<int>(0,0);
assertTrue (1 == i);
}
catch(BadCastException&)
{
Poco::Int64 l = rset.value<Poco::Int64>(0,0);
assertTrue (1 == l);
}
std::string s = rset.value(0,0).convert<std::string>(); std::string s = rset.value(0,0).convert<std::string>();
assertTrue ("1" == s); assertTrue ("1" == s);
int a = rset.value<int>(0,2); try
assertTrue (3 == a); {
int a = rset.value<int>(0,2);
assertTrue (3 == a);
}
catch(BadCastException&)
{
Poco::Int64 l = rset.value<Poco::Int64>(0,2);
assertTrue (3 == l);
}
try try
{ {
@ -2875,14 +2890,25 @@ void SQLExecutor::internalExtraction()
} }
assertTrue ("5" == s); assertTrue ("5" == s);
i = rset.value("str0", 2); int i = rset.value("str0", 2);
assertTrue (5 == i); assertTrue (5 == i);
const Column<std::deque<int> >& col = rset.column<std::deque<int> >(0); try
Column<std::deque<int> >::Iterator it = col.begin(); {
Column<std::deque<int> >::Iterator end = col.end(); const Column<std::deque<int>>& col = rset.column<std::deque<int> >(0);
for (int i = 1; it != end; ++it, ++i) Column<std::deque<int>>::Iterator it = col.begin();
assertTrue (*it == i); Column<std::deque<int>>::Iterator end = col.end();
for (int j = 1; it != end; ++it, ++j)
assertTrue (*it == j);
}
catch(BadCastException&)
{
const Column<std::deque<Poco::Int64>>& col = rset.column<std::deque<Poco::Int64> >(0);
Column<std::deque<Poco::Int64>>::Iterator it = col.begin();
Column<std::deque<Poco::Int64>>::Iterator end = col.end();
for (Poco::Int64 l = 1; it != end; ++it, ++l)
assertTrue (*it == l);
}
rset = (session() << "SELECT COUNT(*) AS cnt FROM Vectors", now); rset = (session() << "SELECT COUNT(*) AS cnt FROM Vectors", now);
@ -2929,6 +2955,11 @@ void SQLExecutor::internalExtraction()
std::cout << ce.displayText() << std::endl; std::cout << ce.displayText() << std::endl;
fail (__func__, __LINE__, __FILE__); fail (__func__, __LINE__, __FILE__);
} }
catch(Exception& ce)
{
std::cout << ce.displayText() << std::endl;
fail (__func__, __LINE__, __FILE__);
}
} }
@ -3937,7 +3968,7 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connector, c
try try
{ {
local.setFeature("autoCommit", true); local.setFeature("autoCommit", true);
fail ("must fail on autocommit setting during transaction", __LINE__); fail ("must fail on autocommit setting during transaction", __LINE__, __FILE__);
} catch(const Poco::InvalidAccessException&) { } } catch(const Poco::InvalidAccessException&) { }
// but setting it to its current state is allowed (no-op) // but setting it to its current state is allowed (no-op)
@ -3992,7 +4023,7 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connector, c
} }
void SQLExecutor::transaction(const std::string& connector, const std::string& connect) void SQLExecutor::transaction(const std::string& connector, const std::string& connect, bool readUncommitted)
{ {
if (!session().canTransact()) if (!session().canTransact())
{ {
@ -4076,7 +4107,9 @@ void SQLExecutor::transaction(const std::string& connector, const std::string& c
try try
{ {
stmt1.wait(5000); stmt1.wait(5000);
if (local.getTransactionIsolation() == Session::TRANSACTION_READ_UNCOMMITTED) if (readUncommitted &&
local.hasTransactionIsolation(Session::TRANSACTION_READ_UNCOMMITTED) &&
local.getTransactionIsolation() == Session::TRANSACTION_READ_UNCOMMITTED)
assertTrue (0 == locCount); assertTrue (0 == locCount);
} catch (TimeoutException&) } catch (TimeoutException&)
{ std::cerr << '[' << name() << ']' << " Warning: async query timed out." << std::endl; } { std::cerr << '[' << name() << ']' << " Warning: async query timed out." << std::endl; }
@ -4150,72 +4183,80 @@ struct TestRollbackTransactor
void SQLExecutor::transactor() void SQLExecutor::transactor()
{ {
int count = 0;
bool autoCommit = session().getFeature("autoCommit");
auto ti = session().getTransactionIsolation();
session().setFeature("autoCommit", false);
session().setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED);
TestCommitTransactor ct;
Transaction t1(session(), ct);
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (1 == count);
session() << "DELETE FROM Person", now; session().commit();
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try try
{ {
TestRollbackTransactor rt; int count = 0;
Transaction t(session(), rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now; bool autoCommit = session().getFeature("autoCommit");
assertTrue (0 == count); auto ti = session().getTransactionIsolation();
try session().setFeature("autoCommit", false);
session().setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED);
TestCommitTransactor ct;
Transaction t1(session(), ct);
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (1 == count);
session() << "DELETE FROM Person", now; session().commit();
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try
{
TestRollbackTransactor rt;
Transaction t(session(), rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try
{
TestRollbackTransactor rt;
Transaction t(session());
t.transact(rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try
{
TestRollbackTransactor rt;
Transaction t(session(), false);
t.transact(rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try
{
TestRollbackTransactor rt;
Transaction t(session(), true);
t.transact(rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
session().commit();
// restore the original transaction state
session().setFeature("autoCommit", autoCommit);
setTransactionIsolation(session(), ti);
}
catch (Poco::Exception& ex)
{ {
TestRollbackTransactor rt; std::cerr << __func__ << ':' << ex.displayText() << std::endl;
Transaction t(session()); fail (__func__, __LINE__, __FILE__);
t.transact(rt); }
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try
{
TestRollbackTransactor rt;
Transaction t(session(), false);
t.transact(rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
try
{
TestRollbackTransactor rt;
Transaction t(session(), true);
t.transact(rt);
fail ("must fail");
} catch (Poco::Exception&) { }
session() << "SELECT count(*) FROM Person", into(count), now;
assertTrue (0 == count);
session().commit();
// restore the original transaction state
session().setFeature("autoCommit", autoCommit);
setTransactionIsolation(session(), ti);
} }

View File

@ -9,6 +9,6 @@ vc.project.prototype = TestSuite_vs90.vcproj
# TODO, for now we can just send cpp std via AdditionalOptions (see below) # TODO, for now we can just send cpp std via AdditionalOptions (see below)
#vc.project.compiler.std.cpp=stdcpp17 #vc.project.compiler.std.cpp=stdcpp17
#vc.project.compiler.std.c=stdc11 #vc.project.compiler.std.c=stdc11
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.compiler.include = ..\\src;..\\..\\Foundation\\include vc.project.compiler.include = ..\\src;..\\..\\Foundation\\include
vc.project.linker.dependencies.Win32 = iphlpapi.lib vc.project.linker.dependencies.Win32 = iphlpapi.lib

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
@ -357,8 +357,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -391,8 +393,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -422,8 +426,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -456,8 +462,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -487,8 +495,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -521,8 +531,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -552,8 +564,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -586,8 +600,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -617,8 +633,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -651,8 +669,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -682,8 +702,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -716,8 +738,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -747,8 +771,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -781,8 +807,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -812,8 +840,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -846,8 +876,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -877,8 +909,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -911,8 +945,10 @@
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -940,36 +976,58 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Binder.cpp"> <ClCompile Include="src\Binder.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Connector.cpp"> <ClCompile Include="src\Connector.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\DataTest.cpp"> <ClCompile Include="src\DataTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\DataTestSuite.cpp"> <ClCompile Include="src\DataTestSuite.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Driver.cpp"> <ClCompile Include="src\Driver.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Extractor.cpp"> <ClCompile Include="src\Extractor.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Preparator.cpp"> <ClCompile Include="src\Preparator.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionImpl.cpp"> <ClCompile Include="src\SessionImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SessionPoolTest.cpp"> <ClCompile Include="src\SessionPoolTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\SQLParserTest.cpp"> <ClCompile Include="src\SQLParserTest.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\TestStatementImpl.cpp"> <ClCompile Include="src\TestStatementImpl.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

View File

@ -2,55 +2,55 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="DataCore"> <Filter Include="DataCore">
<UniqueIdentifier>{bfb939fb-2a9d-4da7-b6ad-e04d4a293d2f}</UniqueIdentifier> <UniqueIdentifier>{eb163d66-4f6f-42de-a04e-52e38dfb9225}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="DataCore\Header Files"> <Filter Include="DataCore\Header Files">
<UniqueIdentifier>{fbff398e-274d-4f64-b41f-65f7a7fc7c2c}</UniqueIdentifier> <UniqueIdentifier>{b463247e-94f4-43c7-872f-7668fbd733b8}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="DataCore\Source Files"> <Filter Include="DataCore\Source Files">
<UniqueIdentifier>{83f79846-18d7-4869-ab18-f9a220d7e22c}</UniqueIdentifier> <UniqueIdentifier>{da33cba1-cbb5-4ba3-ab34-85e43ab42f82}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite"> <Filter Include="_Suite">
<UniqueIdentifier>{39b1a2ac-3b5c-40b5-89aa-05484f2b26b0}</UniqueIdentifier> <UniqueIdentifier>{ef265d31-0949-467d-973a-c1f09e433897}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite\Header Files"> <Filter Include="_Suite\Header Files">
<UniqueIdentifier>{1b5be6d4-1d17-4ef9-a524-6e891779d7e7}</UniqueIdentifier> <UniqueIdentifier>{3d13feb6-806a-4eb4-8b46-c355dc1cc571}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Suite\Source Files"> <Filter Include="_Suite\Source Files">
<UniqueIdentifier>{b771eb76-d75b-468b-b09c-ea802323ba47}</UniqueIdentifier> <UniqueIdentifier>{da4e4535-7278-4c9e-b4c0-d056f7e33f27}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Driver"> <Filter Include="_Driver">
<UniqueIdentifier>{2a5cd233-fc4d-42d5-94ec-073698b29255}</UniqueIdentifier> <UniqueIdentifier>{16b4ea46-09ae-4c53-9037-2a7cd06b5296}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="_Driver\Source Files"> <Filter Include="_Driver\Source Files">
<UniqueIdentifier>{9729b7a6-eefe-4063-8711-adeb071c8a47}</UniqueIdentifier> <UniqueIdentifier>{fe4a83c2-964c-4298-99f0-404b648ff97f}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="TestSession"> <Filter Include="TestSession">
<UniqueIdentifier>{2eb01c5a-4b7e-4595-aa6d-6224e546f35c}</UniqueIdentifier> <UniqueIdentifier>{6b1d9cf8-1073-4412-8255-037c48829507}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="TestSession\Header Files"> <Filter Include="TestSession\Header Files">
<UniqueIdentifier>{5cb5afec-f610-4725-b20b-1a5f9abd7290}</UniqueIdentifier> <UniqueIdentifier>{8194cc84-8a37-4dd6-94c7-7c469eeb4aa6}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="TestSession\Source Files"> <Filter Include="TestSession\Source Files">
<UniqueIdentifier>{e0bd3e5b-1fcc-4476-8bbf-35c4a1c956e9}</UniqueIdentifier> <UniqueIdentifier>{1cdf3a0d-7bf6-44fd-b651-3e1a4311c6d6}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SessionPooling"> <Filter Include="SessionPooling">
<UniqueIdentifier>{e5e2a5fe-1877-4def-ae55-49c843216fa7}</UniqueIdentifier> <UniqueIdentifier>{3b4ca634-cf77-419c-8f6b-a7923d3ce3eb}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SessionPooling\Header Files"> <Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{3e80b53f-9999-4bdb-a94a-712c0ff85c93}</UniqueIdentifier> <UniqueIdentifier>{58df62f8-9bfe-4849-9e2e-6888973db2c5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SessionPooling\Source Files"> <Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{a20048d6-a82e-464c-84d2-e605d0c8bdf3}</UniqueIdentifier> <UniqueIdentifier>{06862e3d-b7dc-42fb-a498-cf483fd5235a}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser"> <Filter Include="SQLParser">
<UniqueIdentifier>{f5928423-1e7c-4fdb-a4d4-ce8282e4586e}</UniqueIdentifier> <UniqueIdentifier>{c5a9408f-0a19-400c-a269-129ab41fea51}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\Header Files"> <Filter Include="SQLParser\Header Files">
<UniqueIdentifier>{3b9ede37-08a8-41e5-b770-c602e121d367}</UniqueIdentifier> <UniqueIdentifier>{f27b7199-f2fa-48be-b1a6-9bf7294ca2d9}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="SQLParser\Source Files"> <Filter Include="SQLParser\Source Files">
<UniqueIdentifier>{62f36aaa-94ce-43ce-985d-baba339bbfd8}</UniqueIdentifier> <UniqueIdentifier>{9ab4a54c-2ad7-48f7-b476-dee9bb5a27d8}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -230,7 +230,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros"/>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion> <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoEncodingsA64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoEncodingsA64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoEncodingsmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoEncodingsmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoEncodingsmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoEncodingsmtd</TargetName>
@ -344,13 +344,16 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoEncodingsA64d.dll</OutputFile> <OutputFile>..\binA64\PocoEncodingsA64d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\binA64\PocoEncodingsA64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\libA64\PocoEncodingsd.lib</ImportLibrary> <ImportLibrary>..\libA64\PocoEncodingsd.lib</ImportLibrary>
@ -376,7 +379,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\binA64\PocoEncodingsA64.dll</OutputFile> <OutputFile>..\binA64\PocoEncodingsA64.dll</OutputFile>
@ -403,11 +409,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\libA64\PocoEncodingsmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoEncodingsmtd.lib</OutputFile> <OutputFile>..\libA64\PocoEncodingsmtd.lib</OutputFile>
@ -432,7 +440,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoEncodingsmt.lib</OutputFile> <OutputFile>..\libA64\PocoEncodingsmt.lib</OutputFile>
@ -451,11 +462,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\libA64\PocoEncodingsmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoEncodingsmdd.lib</OutputFile> <OutputFile>..\libA64\PocoEncodingsmdd.lib</OutputFile>
@ -480,7 +493,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\libA64\PocoEncodingsmd.lib</OutputFile> <OutputFile>..\libA64\PocoEncodingsmd.lib</OutputFile>
@ -502,13 +518,16 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoEncodingsd.dll</OutputFile> <OutputFile>..\bin\PocoEncodingsd.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\PocoEncodingsd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\lib\PocoEncodingsd.lib</ImportLibrary> <ImportLibrary>..\lib\PocoEncodingsd.lib</ImportLibrary>
@ -534,7 +553,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoEncodings.dll</OutputFile> <OutputFile>..\bin\PocoEncodings.dll</OutputFile>
@ -561,11 +583,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoEncodingsmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoEncodingsmtd.lib</OutputFile> <OutputFile>..\lib\PocoEncodingsmtd.lib</OutputFile>
@ -590,7 +614,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoEncodingsmt.lib</OutputFile> <OutputFile>..\lib\PocoEncodingsmt.lib</OutputFile>
@ -609,11 +636,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoEncodingsmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoEncodingsmdd.lib</OutputFile> <OutputFile>..\lib\PocoEncodingsmdd.lib</OutputFile>
@ -635,11 +664,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib\PocoEncodingsmd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoEncodingsmd.lib</OutputFile> <OutputFile>..\lib\PocoEncodingsmd.lib</OutputFile>
@ -661,13 +692,16 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoEncodings64d.dll</OutputFile> <OutputFile>..\bin64\PocoEncodings64d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\PocoEncodings64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<ImportLibrary>..\lib64\PocoEncodingsd.lib</ImportLibrary> <ImportLibrary>..\lib64\PocoEncodingsd.lib</ImportLibrary>
@ -693,7 +727,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>..\bin64\PocoEncodings64.dll</OutputFile> <OutputFile>..\bin64\PocoEncodings64.dll</OutputFile>
@ -720,11 +757,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoEncodingsmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoEncodingsmtd.lib</OutputFile> <OutputFile>..\lib64\PocoEncodingsmtd.lib</OutputFile>
@ -749,7 +788,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoEncodingsmt.lib</OutputFile> <OutputFile>..\lib64\PocoEncodingsmt.lib</OutputFile>
@ -768,11 +810,13 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoEncodingsmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoEncodingsmdd.lib</OutputFile> <OutputFile>..\lib64\PocoEncodingsmdd.lib</OutputFile>
@ -797,7 +841,10 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat/>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoEncodingsmd.lib</OutputFile> <OutputFile>..\lib64\PocoEncodingsmd.lib</OutputFile>
@ -840,99 +887,163 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="src\DoubleByteEncoding.cpp"> <ClCompile Include="src\DoubleByteEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Encodings.cpp"> <ClCompile Include="src\Encodings.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_10Encoding.cpp"> <ClCompile Include="src\ISO8859_10Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_11Encoding.cpp"> <ClCompile Include="src\ISO8859_11Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_13Encoding.cpp"> <ClCompile Include="src\ISO8859_13Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_14Encoding.cpp"> <ClCompile Include="src\ISO8859_14Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_16Encoding.cpp"> <ClCompile Include="src\ISO8859_16Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_3Encoding.cpp"> <ClCompile Include="src\ISO8859_3Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_4Encoding.cpp"> <ClCompile Include="src\ISO8859_4Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_5Encoding.cpp"> <ClCompile Include="src\ISO8859_5Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_6Encoding.cpp"> <ClCompile Include="src\ISO8859_6Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_7Encoding.cpp"> <ClCompile Include="src\ISO8859_7Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_8Encoding.cpp"> <ClCompile Include="src\ISO8859_8Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\ISO8859_9Encoding.cpp"> <ClCompile Include="src\ISO8859_9Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacCentralEurRomanEncoding.cpp"> <ClCompile Include="src\MacCentralEurRomanEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacChineseSimpEncoding.cpp"> <ClCompile Include="src\MacChineseSimpEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacChineseTradEncoding.cpp"> <ClCompile Include="src\MacChineseTradEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacCyrillicEncoding.cpp"> <ClCompile Include="src\MacCyrillicEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacJapaneseEncoding.cpp"> <ClCompile Include="src\MacJapaneseEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacKoreanEncoding.cpp"> <ClCompile Include="src\MacKoreanEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\MacRomanEncoding.cpp"> <ClCompile Include="src\MacRomanEncoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows1253Encoding.cpp"> <ClCompile Include="src\Windows1253Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows1254Encoding.cpp"> <ClCompile Include="src\Windows1254Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows1255Encoding.cpp"> <ClCompile Include="src\Windows1255Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows1256Encoding.cpp"> <ClCompile Include="src\Windows1256Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows1257Encoding.cpp"> <ClCompile Include="src\Windows1257Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows1258Encoding.cpp"> <ClCompile Include="src\Windows1258Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows874Encoding.cpp"> <ClCompile Include="src\Windows874Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows932Encoding.cpp"> <ClCompile Include="src\Windows932Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows936Encoding.cpp"> <ClCompile Include="src\Windows936Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows949Encoding.cpp"> <ClCompile Include="src\Windows949Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<ClCompile Include="src\Windows950Encoding.cpp"> <ClCompile Include="src\Windows950Encoding.cpp">
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,13 +2,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Encodings"> <Filter Include="Encodings">
<UniqueIdentifier>{34b2ce84-20f9-4e80-9644-59e07ccfa790}</UniqueIdentifier> <UniqueIdentifier>{faa93394-b756-435b-9a06-0fed19badbbe}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Encodings\Header Files"> <Filter Include="Encodings\Header Files">
<UniqueIdentifier>{cc1dd9e6-5cf6-4352-9331-2a6066d52900}</UniqueIdentifier> <UniqueIdentifier>{e0d05a7d-2c4d-4f65-85b4-4314086035bf}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Encodings\Source Files"> <Filter Include="Encodings\Source Files">
<UniqueIdentifier>{7bfef72c-94a5-4b28-ba53-ec93ca03fcf2}</UniqueIdentifier> <UniqueIdentifier>{0cc01621-1367-4f74-a521-6bf563c6665a}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -340,6 +340,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -371,6 +373,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -436,6 +440,8 @@
<DebugInformationFormat /> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -472,6 +478,8 @@
</DebugInformationFormat> </DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -542,6 +550,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile> <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
@ -567,6 +577,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile> <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
@ -618,6 +630,8 @@
<DebugInformationFormat /> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoFoundationmt.lib</OutputFile> <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
@ -646,6 +660,8 @@
</DebugInformationFormat> </DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile> <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
@ -699,6 +715,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile> <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
@ -724,6 +742,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile> <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
@ -776,6 +796,8 @@
<DebugInformationFormat /> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies> <AdditionalDependencies>
@ -807,6 +829,8 @@
</DebugInformationFormat> </DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies> <AdditionalDependencies>
@ -2462,4 +2486,4 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" /> <ImportGroup Label="ExtensionTargets" />
</Project> </Project>

View File

@ -921,6 +921,8 @@
<ClCompile Include="src\pcre2_xclass.c"> <ClCompile Include="src\pcre2_xclass.c">
<Filter>RegularExpression\PCRE2 Source Files</Filter> <Filter>RegularExpression\PCRE2 Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\ActiveThreadPool.cpp" />
<ClCompile Include="src\VarVisitor.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\Poco\Any.h"> <ClInclude Include="include\Poco\Any.h">

View File

@ -19,6 +19,7 @@
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#include <string_view>
namespace Poco { namespace Poco {
@ -61,10 +62,28 @@ public:
static void enter(const char* file, int line); static void enter(const char* file, int line);
/// Writes a debug message to the debugger log and breaks into it. /// Writes a debug message to the debugger log and breaks into it.
static constexpr std::string_view sourceFile(const std::string_view& fileName)
/// Utility function for reporting the source file name. The file path is
/// truncated and only the source file name (with extension) is returned.
///
/// For full location reporting (including function name and line number),
/// see `poco_src_loc` macro.
{
std::size_t pos = fileName.find_last_of("/\\");
if (pos == std::string_view::npos) pos = 0;
else if (fileName.length() > 1) ++pos;
return std::string_view(fileName.substr(pos));
}
}; };
} // namespace Poco } // namespace Poco
#define poco_src_loc std::string(Poco::Debugger::sourceFile(__FILE__)) \
.append("::").append(__func__) \
.append("():").append(std::to_string(__LINE__))
#endif // Foundation_Debugger_INCLUDED #endif // Foundation_Debugger_INCLUDED

View File

@ -475,6 +475,11 @@ public:
const std::type_info& type() const; const std::type_info& type() const;
/// Returns the type information of the stored content. /// Returns the type information of the stored content.
std::string typeName(bool demangle = true) const;
/// Returns the type name of the stored content.
/// If demangling is available and emangle is true,
/// the returnsed string will be demangled.
//@ deprecated //@ deprecated
void empty(); void empty();
/// Empties Var. /// Empties Var.
@ -521,23 +526,8 @@ public:
/// This function returns 0 when Var is empty, 1 for POD or the size (i.e. length) /// This function returns 0 when Var is empty, 1 for POD or the size (i.e. length)
/// for held container. /// for held container.
std::string toString() const std::string toString() const;
/// Returns the stored value as string. /// Returns the stored value as string.
{
VarHolder* pHolder = content();
if (!pHolder)
throw InvalidAccessException("Can not convert empty value.");
if (typeid(std::string) == pHolder->type())
return extract<std::string>();
else
{
std::string result;
pHolder->convert(result);
return result;
}
}
static Var parse(const std::string& val); static Var parse(const std::string& val);
/// Parses the string which must be in JSON format /// Parses the string which must be in JSON format
@ -617,17 +607,8 @@ private:
_placeholder.assign<VarHolderImpl<ValueType>, ValueType>(value); _placeholder.assign<VarHolderImpl<ValueType>, ValueType>(value);
} }
void construct(const char* value) void construct(const char* value);
{ void construct(const Var& other);
std::string val(value);
_placeholder.assign<VarHolderImpl<std::string>, std::string>(val);
}
void construct(const Var& other)
{
if (!other.isEmpty())
other.content()->clone(&_placeholder);
}
Placeholder<VarHolder> _placeholder; Placeholder<VarHolder> _placeholder;
}; };
@ -642,6 +623,20 @@ private:
/// Var members /// Var members
/// ///
inline void Var::construct(const char* value)
{
std::string val(value);
_placeholder.assign<VarHolderImpl<std::string>, std::string>(val);
}
inline void Var::construct(const Var& other)
{
if (!other.isEmpty())
other.content()->clone(&_placeholder);
}
inline void Var::swap(Var& other) inline void Var::swap(Var& other)
{ {
if (this == &other) return; if (this == &other) return;
@ -674,6 +669,13 @@ inline const std::type_info& Var::type() const
} }
inline std::string Var::typeName(bool demangle) const
{
VarHolder* pHolder = content();
return pHolder ? demangle ? Poco::demangle(pHolder->type().name()) : pHolder->type().name() : std::string();
}
inline Var::ConstIterator Var::begin() const inline Var::ConstIterator Var::begin() const
{ {
if (size() == 0) return ConstIterator(const_cast<Var*>(this), true); if (size() == 0) return ConstIterator(const_cast<Var*>(this), true);

View File

@ -33,17 +33,27 @@
#include "Poco/UTF8String.h" #include "Poco/UTF8String.h"
#include "Poco/UUID.h" #include "Poco/UUID.h"
#include "Poco/Any.h" #include "Poco/Any.h"
#include "Poco/Format.h"
#include "Poco/Debugger.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include <vector> #include <vector>
#include <list> #include <list>
#include <deque> #include <deque>
#include <typeinfo> #include <typeinfo>
#include <type_traits> #include <type_traits>
#include <string_view>
#undef min #undef min
#undef max #undef max
#include <limits> #include <limits>
#define POCO_VAR_RANGE_EXCEPTION(str, from) \
throw RangeException(Poco::format("%v ((%s/%d) %s > (%s/%d) %s) @ %s.", \
std::string_view(#str), Poco::demangle<F>(), numValDigits(from), std::to_string(from), \
Poco::demangle<T>(), numTypeDigits<T>(), std::to_string(static_cast<T>(from)), \
poco_src_loc))
namespace Poco { namespace Poco {
namespace Dynamic { namespace Dynamic {
@ -312,140 +322,186 @@ protected:
return pVarHolder->assign<VarHolderImpl<T>, T>(val); return pVarHolder->assign<VarHolderImpl<T>, T>(val);
} }
template <typename F, typename T> template <typename F, typename T,
void convertToSmaller(const F& from, T& to) const typename std::enable_if<(std::is_integral<F>::value && std::is_signed<F>::value) ||
/// This function is meant to convert signed numeric values from std::is_floating_point<F>::value, F>::type* = nullptr,
typename std::enable_if<(std::is_integral<T>::value && std::is_signed<T>::value) ||
std::is_floating_point<F>::value, T>::type* = nullptr>
static void convertToSmaller(const F& from, T& to)
/// Converts signed integral, as well as floating-point, values from
/// larger to smaller type. It checks the upper and lower bound and /// larger to smaller type. It checks the upper and lower bound and
/// if from value is within limits of type T (i.e. check calls do not throw), /// if from value is within limits of type T (i.e. check calls do not throw),
/// it is converted. /// it is converted.
{ {
poco_static_assert (std::numeric_limits<F>::is_specialized); if constexpr((std::is_integral<F>::value) && (std::is_floating_point<T>::value))
poco_static_assert (std::numeric_limits<T>::is_specialized); {
poco_static_assert (std::numeric_limits<F>::is_signed); if (isPrecisionLost<F, T>(from))
poco_static_assert (std::numeric_limits<T>::is_signed); POCO_VAR_RANGE_EXCEPTION ("Lost precision", from);
}
checkUpperLimit<F,T>(from); checkUpperLimit<F,T>(from);
checkLowerLimit<F,T>(from); checkLowerLimit<F,T>(from);
to = static_cast<T>(from); to = static_cast<T>(from);
} }
template <typename F, typename T> template <typename F, typename T,
void convertToSmallerUnsigned(const F& from, T& to) const typename std::enable_if<std::is_integral<F>::value && std::is_signed<T>::value, F>::type* = nullptr,
/// This function is meant for converting unsigned integral data types, typename std::enable_if<std::is_floating_point<T>::value, T>::type* = nullptr>
/// from larger to smaller type. Since lower limit is always 0 for unsigned types, static void convertToSmaller(const F& from, T& to)
/// only the upper limit is checked, thus saving some cycles compared to the signed /// Converts signed integral values from integral to floating-point type. Checks for
/// version of the function. If the value to be converted is smaller than /// the loss of precision and if from value is within limits of type T (i.e. check calls do not throw),
/// the maximum value for the target type, the conversion is performed. /// it is converted.
{ {
poco_static_assert (std::numeric_limits<F>::is_specialized); if (isPrecisionLost<F, T>(from))
poco_static_assert (std::numeric_limits<T>::is_specialized); POCO_VAR_RANGE_EXCEPTION ("Lost precision", from);
poco_static_assert (!std::numeric_limits<F>::is_signed); to = static_cast<T>(from);
poco_static_assert (!std::numeric_limits<T>::is_signed); }
template <typename F, typename T,
typename std::enable_if<std::is_same<F, bool>::value>::type* = nullptr,
typename std::enable_if<std::is_floating_point<T>::value, T>::type* = nullptr>
static void convertToSmaller(const F& from, T& to)
/// Converts boolean values to floating-point type.
{
to = static_cast<T>(from);
}
template <typename F, typename T,
typename std::enable_if<std::is_integral<F>::value && !std::is_signed<F>::value, F>::type* = nullptr,
typename std::enable_if<(std::is_integral<T>::value && !std::is_signed<T>::value) || std::is_floating_point<T>::value, T>::type* = nullptr>
static void convertToSmallerUnsigned(const F& from, T& to)
/// Converts unsigned integral data types from larger to smaller, as well as to floating-point, types.
/// Since lower limit is always 0 for unsigned types, only the upper limit is checked, thus
/// saving some cycles compared to the signed version of the function. If the
/// value to be converted is smaller than the maximum value for the target type,
/// the conversion is performed.
{
checkUpperLimit<F,T>(from); checkUpperLimit<F,T>(from);
to = static_cast<T>(from); to = static_cast<T>(from);
} }
template <typename F, typename T> template <typename F, typename T,
void convertSignedToUnsigned(const F& from, T& to) const typename std::enable_if<std::is_integral<F>::value && std::is_signed<F>::value, F>::type* = nullptr,
/// This function is meant for converting signed integral data types to typename std::enable_if<std::is_integral<T>::value && !std::is_signed<T>::value, T>::type* = nullptr>
/// unsigned data types. Negative values can not be converted and if one static void convertSignedToUnsigned(const F& from, T& to)
/// is encountered, RangeException is thrown. /// Converts signed integral data types to unsigned data types.
/// Negative values can not be converted and if one is encountered, RangeException is thrown.
/// If upper limit is within the target data type limits, the conversion is performed. /// If upper limit is within the target data type limits, the conversion is performed.
{ {
poco_static_assert (std::numeric_limits<F>::is_specialized);
poco_static_assert (std::numeric_limits<T>::is_specialized);
poco_static_assert (std::numeric_limits<F>::is_signed);
poco_static_assert (!std::numeric_limits<T>::is_signed);
if (from < 0) if (from < 0)
throw RangeException("Value too small."); POCO_VAR_RANGE_EXCEPTION ("Value too small", from);
checkUpperLimit<std::make_unsigned_t<F>,T>(from); checkUpperLimit<std::make_unsigned_t<F>,T>(from);
to = static_cast<T>(from); to = static_cast<T>(from);
} }
template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true> template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true,
void convertSignedFloatToUnsigned(const F& from, T& to) const typename std::enable_if<std::is_integral<T>::value && !std::is_signed<T>::value, T>::type* = nullptr>
/// This function is meant for converting floating point data types to static void convertSignedFloatToUnsigned(const F& from, T& to)
/// unsigned integral data types. Negative values can not be converted and if one /// Converts floating point data types to unsigned integral data types. Negative values
/// is encountered, RangeException is thrown. /// can not be converted and if one is encountered, RangeException is thrown.
/// If upper limit is within the target data type limits, the conversion is performed. /// If upper limit is within the target data type limits, the conversion is performed.
{ {
poco_static_assert (std::numeric_limits<F>::is_specialized);
poco_static_assert (std::numeric_limits<T>::is_specialized);
poco_static_assert (!std::numeric_limits<F>::is_integer);
poco_static_assert (std::numeric_limits<T>::is_integer);
poco_static_assert (!std::numeric_limits<T>::is_signed);
if (from < 0) if (from < 0)
throw RangeException("Value too small."); POCO_VAR_RANGE_EXCEPTION ("Value too small", from);
checkUpperLimit<F,T>(from); checkUpperLimit<F,T>(from);
to = static_cast<T>(from); to = static_cast<T>(from);
} }
template <typename F, typename T> template <typename F, typename T,
void convertUnsignedToSigned(const F& from, T& to) const typename std::enable_if<std::is_integral<F>::value && !std::is_signed<F>::value, F>::type* = nullptr,
/// This function is meant for converting unsigned integral data types to typename std::enable_if<std::is_integral<T>::value && std::is_signed<T>::value, T>::type* = nullptr>
/// signed integral data types. Negative values can not be converted and if one static void convertUnsignedToSigned(const F& from, T& to)
/// is encountered, RangeException is thrown. /// Converts unsigned integral data types to signed integral data types.
/// If upper limit is within the target data type limits, the conversion is performed. /// If upper limit is within the target data type limits, the conversion is performed.
{ {
poco_static_assert (std::numeric_limits<F>::is_specialized);
poco_static_assert (std::numeric_limits<T>::is_specialized);
poco_static_assert (!std::numeric_limits<F>::is_signed);
poco_static_assert (std::numeric_limits<T>::is_signed);
checkUpperLimit<F,T>(from); checkUpperLimit<F,T>(from);
to = static_cast<T>(from); to = static_cast<T>(from);
} }
template <typename F, typename T,
std::enable_if_t<std::is_integral<F>::value, bool> = true,
std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
static void convertToFP(F& from, T& to)
/// Converts unsigned integral data types to floating-point data types.
/// If the number of significant digits used for the integer vaue exceeds the number
/// of available digits in the floatinng-point destination (ie. if precision would be lost
/// by casting the value), RangeException is thrown.
{
if (isPrecisionLost<F, T>(from))
POCO_VAR_RANGE_EXCEPTION ("Lost precision", from);
to = static_cast<T>(from);
}
private: private:
template <typename F, typename T, std::enable_if_t<std::is_integral<F>::value, bool> = true> template <typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
void checkUpperLimit(const F& from) const static constexpr int numValDigits(const T& value)
{ {
if (from > std::numeric_limits<T>::max()) using U = std::make_unsigned_t<T>;
throw RangeException("Value too large."); if (value == 0) return 0;
int digitCount = 0;
U locVal = value; // to prevent sign preservation
while (locVal >>= 1) ++digitCount;
return digitCount;
}
template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
static constexpr int numValDigits(T value)
{
return numValDigits<int64_t>(static_cast<int64_t>(value));
}
template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
static constexpr int numTypeDigits()
{
return std::numeric_limits<T>::digits;
}
template <typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
static constexpr int numTypeDigits()
{
return numValDigits(std::numeric_limits<T>::max());
}
template <typename F, typename T,
std::enable_if_t<std::is_integral<F>::value, bool> = true,
std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
static bool isPrecisionLost(const F& from)
// Checks for loss of precision in integral -> floating point conversion.
{
return numValDigits(from) > numTypeDigits<T>();
} }
template <typename F, typename T, std::enable_if_t<std::is_integral<F>::value, bool> = true> template <typename F, typename T, std::enable_if_t<std::is_integral<F>::value, bool> = true>
void checkLowerLimit(const F& from) const static void checkUpperLimit(const F& from)
{ {
if (from < std::numeric_limits<T>::min()) if (from > static_cast<F>(std::numeric_limits<T>::max()))
throw RangeException("Value too small."); POCO_VAR_RANGE_EXCEPTION ("Value too big", from);
}
template <typename F, typename T, std::enable_if_t<std::is_integral<F>::value, bool> = true>
static void checkLowerLimit(const F& from)
{
if (from < static_cast<F>(std::numeric_limits<T>::min()))
POCO_VAR_RANGE_EXCEPTION ("Value too small", from);
} }
template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true> template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true>
void checkUpperLimit(const F& from) const static void checkUpperLimit(const F& from)
{ {
if (std::is_floating_point<T>::value) if ((from > static_cast<F>(std::numeric_limits<T>::max())))
{ POCO_VAR_RANGE_EXCEPTION ("Value too big", from);
if (from > std::numeric_limits<T>::max())
throw RangeException("Value too large.");
}
else
{
// Avoid clang -Wimplicit-int-float-conversion warning with an explicit cast.
if (from > static_cast<F>(std::numeric_limits<T>::max()))
throw RangeException("Value too large.");
}
} }
template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true> template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true>
void checkLowerLimit(const F& from) const static void checkLowerLimit(const F& from)
{ {
if (std::is_floating_point<T>::value) if constexpr(std::is_floating_point<T>::value)
{ {
if (from < -std::numeric_limits<T>::max()) if (static_cast<F>(-std::numeric_limits<T>::max()) > from)
throw RangeException("Value too small."); POCO_VAR_RANGE_EXCEPTION ("Value too small", from);
}
else
{
// Avoid clang -Wimplicit-int-float-conversion warning with an explicit cast.
if (from < static_cast<F>(std::numeric_limits<T>::min()))
throw RangeException("Value too small.");
} }
else if (from < static_cast<F>(std::numeric_limits<T>::min()))
POCO_VAR_RANGE_EXCEPTION ("Value too small", from);
} }
}; };
@ -828,12 +884,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -984,12 +1040,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -1137,12 +1193,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -1289,12 +1345,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -1456,12 +1512,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -1608,12 +1664,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -1760,12 +1816,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const
@ -1912,12 +1968,12 @@ public:
void convert(float& val) const void convert(float& val) const
{ {
val = static_cast<float>(_val); convertToFP(_val, val);
} }
void convert(double& val) const void convert(double& val) const
{ {
val = static_cast<double>(_val); convertToFP(_val, val);
} }
void convert(char& val) const void convert(char& val) const

View File

@ -63,6 +63,7 @@ std::string Foundation_API format(const std::string& fmt, const Any& value);
/// * E signed floating-point value in the form [-]d.ddddE[<sign>]dd[d] /// * E signed floating-point value in the form [-]d.ddddE[<sign>]dd[d]
/// * f signed floating-point value in the form [-]dddd.dddd /// * f signed floating-point value in the form [-]dddd.dddd
/// * s std::string /// * s std::string
/// * v std::string_view
/// * z std::size_t /// * z std::size_t
/// ///
/// The following flags are supported: /// The following flags are supported:

View File

@ -145,8 +145,8 @@ private:
int policy; int policy;
Event done; Event done;
std::size_t stackSize; std::size_t stackSize;
bool started; std::atomic<bool> started;
bool joined; std::atomic<bool> joined;
std::string name; std::string name;
int affinity; int affinity;
mutable FastMutex mutex; mutable FastMutex mutex;

View File

@ -21,6 +21,16 @@
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#include <cstdint> #include <cstdint>
#include <type_traits> #include <type_traits>
#if defined(__clang__) || (defined (__GNUC__) && (__GNUC__ >= 3))
# if (__cplusplus >= 201703L)
# if __has_include(<cxxabi.h>)
# include <typeinfo>
# include <cxxabi.h>
# include <cstdlib>
# define POCO_HAVE_CXXABI_H
# endif // __has_include(<cxxabi.h>)
# endif // __cplusplus >= 201703L
#endif // defined(__clang__) || (defined (__GNUC__) && (__GNUC__ >= 3))
namespace Poco { namespace Poco {
@ -73,6 +83,40 @@ using UIntPtr = std::uintptr_t;
#endif #endif
inline std::string Foundation_API demangle(const char* typeName)
{
std::string result(typeName);
#ifdef POCO_HAVE_CXXABI_H
int status;
char* demangled = abi::__cxa_demangle(typeName, nullptr, nullptr, &status);
if (demangled)
{
if (status == 0) result = demangled;
else
{
switch (status)
{
case -1: result = "[ERRMEM]"; break;
case -2: result = "[ERRNAME]"; break;
case -3: result = "[ERRARG]"; break;
default: result = "[ERRUNK]";
}
}
std::free(demangled);
}
#endif
return result;
}
template <typename T>
std::string demangle()
{
return demangle(typeid(T).name());
}
} // namespace Poco } // namespace Poco

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -7,5 +7,5 @@ vc.project.platforms = Win32
vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.prototype = ${vc.project.name}_vs90.vcproj
vc.project.compiler.include = ..\\..\\..\\Foundation\\include vc.project.compiler.include = ..\\..\\..\\Foundation\\include
vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 vc.project.compiler.additionalOptions = /Zc:__cplusplus
vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib

View File

@ -62,9 +62,7 @@ namespace Poco {
{ {
_buffer[0] = 0; _buffer[0] = 0;
#if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ #if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ || _GNU_SOURCE
setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
#elif _GNU_SOURCE
setMessage(strerror_r(err, _buffer, sizeof(_buffer))); setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
#else #else
setMessage(strerror(err)); setMessage(strerror(err));

View File

@ -20,6 +20,7 @@
#include <locale> #include <locale>
#endif #endif
#include <cstddef> #include <cstddef>
#include <string_view>
namespace Poco { namespace Poco {
@ -222,6 +223,9 @@ namespace
case 's': case 's':
str << RefAnyCast<std::string>(*itVal++); str << RefAnyCast<std::string>(*itVal++);
break; break;
case 'v':
str << RefAnyCast<std::string_view>(*itVal++);
break;
case 'z': case 'z':
str << AnyCast<std::size_t>(*itVal++); str << AnyCast<std::size_t>(*itVal++);
break; break;

View File

@ -20,6 +20,7 @@
#include "Poco/Timespan.h" #include "Poco/Timespan.h"
#include "Poco/Timestamp.h" #include "Poco/Timestamp.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Error.h"
#include <signal.h> #include <signal.h>
#if POCO_OS == POCO_OS_FREE_BSD #if POCO_OS == POCO_OS_FREE_BSD
@ -194,8 +195,10 @@ void ThreadImpl::setPriorityImpl(int prio)
{ {
struct sched_param par; struct sched_param par;
par.sched_priority = mapPrio(_pData->prio, SCHED_OTHER); par.sched_priority = mapPrio(_pData->prio, SCHED_OTHER);
if (pthread_setschedparam(_pData->thread, SCHED_OTHER, &par)) int errorCode;
throw SystemException("cannot set thread priority"); if ((errorCode = pthread_setschedparam(_pData->thread, SCHED_OTHER, &par)))
throw SystemException(Poco::format("cannot set thread priority (%s)",
Error::getMessage(errorCode)));
} }
} }
} }
@ -209,8 +212,10 @@ void ThreadImpl::setOSPriorityImpl(int prio, int policy)
{ {
struct sched_param par; struct sched_param par;
par.sched_priority = prio; par.sched_priority = prio;
if (pthread_setschedparam(_pData->thread, policy, &par)) int errorCode;
throw SystemException("cannot set thread priority"); if ((errorCode = pthread_setschedparam(_pData->thread, policy, &par)))
throw SystemException(Poco::format("cannot set thread priority (%s)",
Error::getMessage(errorCode)));
} }
_pData->prio = reverseMapPrio(prio, policy); _pData->prio = reverseMapPrio(prio, policy);
_pData->osPrio = prio; _pData->osPrio = prio;
@ -291,24 +296,29 @@ void ThreadImpl::startImpl(SharedPtr<Runnable> pTarget)
if (_pData->stackSize != 0) if (_pData->stackSize != 0)
{ {
if (0 != pthread_attr_setstacksize(&attributes, _pData->stackSize)) int errorCode;
if ((errorCode = pthread_attr_setstacksize(&attributes, _pData->stackSize)))
{ {
pthread_attr_destroy(&attributes); pthread_attr_destroy(&attributes);
throw SystemException("cannot set thread stack size"); throw SystemException(Poco::format("cannot set thread stack size: (%s)",
Error::getMessage(errorCode)));
} }
} }
{ {
FastMutex::ScopedLock l(_pData->mutex); FastMutex::ScopedLock l(_pData->mutex);
_pData->pRunnableTarget = pTarget; _pData->pRunnableTarget = pTarget;
if (pthread_create(&_pData->thread, &attributes, runnableEntry, this)) int errorCode;
if ((errorCode = pthread_create(&_pData->thread, &attributes, runnableEntry, this)))
{ {
_pData->pRunnableTarget = 0; _pData->pRunnableTarget = 0;
pthread_attr_destroy(&attributes); pthread_attr_destroy(&attributes);
throw SystemException("cannot start thread"); throw SystemException(Poco::format("cannot start thread (%s)",
Error::getMessage(errorCode)));
} }
} }
_pData->started = true; _pData->started = true;
_pData->joined = false;
pthread_attr_destroy(&attributes); pthread_attr_destroy(&attributes);
if (_pData->policy == SCHED_OTHER) if (_pData->policy == SCHED_OTHER)
@ -317,16 +327,20 @@ void ThreadImpl::startImpl(SharedPtr<Runnable> pTarget)
{ {
struct sched_param par; struct sched_param par;
par.sched_priority = mapPrio(_pData->prio, SCHED_OTHER); par.sched_priority = mapPrio(_pData->prio, SCHED_OTHER);
if (pthread_setschedparam(_pData->thread, SCHED_OTHER, &par)) int errorCode;
throw SystemException("cannot set thread priority"); if ((errorCode = pthread_setschedparam(_pData->thread, SCHED_OTHER, &par)))
throw SystemException(Poco::format("cannot set thread priority (%s)",
Error::getMessage(errorCode)));
} }
} }
else else
{ {
struct sched_param par; struct sched_param par;
par.sched_priority = _pData->osPrio; par.sched_priority = _pData->osPrio;
if (pthread_setschedparam(_pData->thread, _pData->policy, &par)) int errorCode;
throw SystemException("cannot set thread priority"); if ((errorCode = pthread_setschedparam(_pData->thread, _pData->policy, &par)))
throw SystemException(Poco::format("cannot set thread priority (%s)",
Error::getMessage(errorCode)));
} }
} }
@ -335,20 +349,25 @@ void ThreadImpl::joinImpl()
{ {
if (!_pData->started) return; if (!_pData->started) return;
_pData->done.wait(); _pData->done.wait();
void* result; if (!_pData->joined)
if (pthread_join(_pData->thread, &result)) {
throw SystemException("cannot join thread"); int errorCode;
_pData->joined = true; if ((errorCode = pthread_join(_pData->thread, nullptr)))
throw SystemException(Poco::format("cannot join thread (%s)",
Error::getMessage(errorCode)));
_pData->joined = true;
}
} }
bool ThreadImpl::joinImpl(long milliseconds) bool ThreadImpl::joinImpl(long milliseconds)
{ {
if (_pData->started && _pData->done.tryWait(milliseconds)) if (_pData->started && _pData->done.tryWait(milliseconds) && !_pData->joined)
{ {
void* result; int errorCode;
if (pthread_join(_pData->thread, &result)) if ((errorCode = pthread_join(_pData->thread, nullptr)))
throw SystemException("cannot join thread"); throw SystemException(Poco::format("cannot join thread (%s)",
Error::getMessage(errorCode)));
_pData->joined = true; _pData->joined = true;
return true; return true;
} }

View File

@ -368,6 +368,24 @@ Var& Var::getAt(const std::string& name)
} }
std::string Var::toString() const
{
VarHolder* pHolder = content();
if (!pHolder)
throw InvalidAccessException("Can not convert empty value.");
if (typeid(std::string) == pHolder->type())
return extract<std::string>();
else
{
std::string result;
pHolder->convert(result);
return result;
}
}
Var Var::parse(const std::string& val) Var Var::parse(const std::string& val)
{ {
std::string::size_type t = 0; std::string::size_type t = 0;

Some files were not shown because too many files have changed in this diff Show More